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

[dpdk.git] / lib / librte_ip_frag / ip_frag_internal.c

diff --git a/lib/librte_ip_frag/ip_frag_internal.c b/lib/librte_ip_frag/ip_frag_internal.c
index 219221f..7397aa6 100644 (file)
--- a/lib/librte_ip_frag/ip_frag_internal.c
+++ b/lib/librte_ip_frag/ip_frag_internal.c
@@ -1,42 +1,11 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2014 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-2014 Intel Corporation
  */
 
 #include <stddef.h>
 
 #include <rte_jhash.h>
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
 #include <rte_hash_crc.h>
-#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
 
 #include "ip_frag_common.h"
 
@@ -94,14 +63,14 @@ ipv4_frag_hash(const struct ip_frag_key *key, uint32_t *v1, uint32_t *v2)
 
        p = (const uint32_t *)&key->src_dst;
 
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
+#ifdef RTE_ARCH_X86
        v = rte_hash_crc_4byte(p[0], PRIME_VALUE);
        v = rte_hash_crc_4byte(p[1], v);
        v = rte_hash_crc_4byte(key->id, v);
 #else
 
        v = rte_jhash_3words(p[0], p[1], key->id, PRIME_VALUE);
-#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
+#endif /* RTE_ARCH_X86 */
 
        *v1 =  v;
        *v2 = (v << 7) + (v >> 14);
@@ -115,7 +84,7 @@ ipv6_frag_hash(const struct ip_frag_key *key, uint32_t *v1, uint32_t *v2)
 
        p = (const uint32_t *) &key->src_dst;
 
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
+#ifdef RTE_ARCH_X86
        v = rte_hash_crc_4byte(p[0], PRIME_VALUE);
        v = rte_hash_crc_4byte(p[1], v);
        v = rte_hash_crc_4byte(p[2], v);
@@ -130,7 +99,7 @@ ipv6_frag_hash(const struct ip_frag_key *key, uint32_t *v1, uint32_t *v2)
        v = rte_jhash_3words(p[0], p[1], p[2], PRIME_VALUE);
        v = rte_jhash_3words(p[3], p[4], p[5], v);
        v = rte_jhash_3words(p[6], p[7], key->id, v);
-#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
+#endif /* RTE_ARCH_X86 */
 
        *v1 =  v;
        *v2 = (v << 7) + (v >> 14);
@@ -162,7 +131,7 @@ ip_frag_process(struct ip_frag_pkt *fp, struct rte_ip_frag_death_row *dr,
        }
 
        /*
-        * errorneous packet: either exceeed max allowed number of fragments,
+        * erroneous packet: either exceed max allowed number of fragments,
         * or duplicate first/last fragment encountered.
         */
        if (idx >= sizeof (fp->frags) / sizeof (fp->frags[0])) {
@@ -200,7 +169,7 @@ ip_frag_process(struct ip_frag_pkt *fp, struct rte_ip_frag_death_row *dr,
                ip_frag_key_invalidate(&fp->key);
                IP_FRAG_MBUF2DR(dr, mb);
 
-               return (NULL);
+               return NULL;
        }
 
        fp->frags[idx].ofs = ofs;
@@ -211,7 +180,7 @@ ip_frag_process(struct ip_frag_pkt *fp, struct rte_ip_frag_death_row *dr,
 
        /* not all fragments are collected yet. */
        if (likely (fp->frag_size < fp->total_size)) {
-               return (mb);
+               return mb;
 
        /* if we collected all fragments, then try to reassemble. */
        } else if (fp->frag_size == fp->total_size &&
@@ -259,7 +228,7 @@ ip_frag_process(struct ip_frag_pkt *fp, struct rte_ip_frag_death_row *dr,
 
        /* we are done with that entry, invalidate it. */
        ip_frag_key_invalidate(&fp->key);
-       return (mb);
+       return mb;
 }
 
 
@@ -327,7 +296,7 @@ ip_frag_find(struct rte_ip_frag_tbl *tbl, struct rte_ip_frag_death_row *dr,
        IP_FRAG_TBL_STAT_UPDATE(&tbl->stat, fail_total, (pkt == NULL));
 
        tbl->last = pkt;
-       return (pkt);
+       return pkt;
 }
 
 struct ip_frag_pkt *
@@ -346,11 +315,11 @@ ip_frag_lookup(struct rte_ip_frag_tbl *tbl,
        max_cycles = tbl->max_cycles;
        assoc = tbl->bucket_entries;
 
-       if (tbl->last != NULL && ip_frag_key_cmp(&tbl->last->key, key) == 0)
-               return (tbl->last);
+       if (tbl->last != NULL && ip_frag_key_cmp(key, &tbl->last->key) == 0)
+               return tbl->last;
 
        /* different hashing methods for IPv4 and IPv6 */
-       if (key->key_len == 1)
+       if (key->key_len == IPV4_KEYLEN)
                ipv4_frag_hash(key, &sig1, &sig2);
        else
                ipv6_frag_hash(key, &sig1, &sig2);
@@ -378,8 +347,8 @@ ip_frag_lookup(struct rte_ip_frag_tbl *tbl,
                                        p1, i, assoc,
                        IPv6_KEY_BYTES(p1[i].key.src_dst), p1[i].key.id, p1[i].start);
 
-               if (ip_frag_key_cmp(&p1[i].key, key) == 0)
-                       return (p1 + i);
+               if (ip_frag_key_cmp(key, &p1[i].key) == 0)
+                       return p1 + i;
                else if (ip_frag_key_is_empty(&p1[i].key))
                        empty = (empty == NULL) ? (p1 + i) : empty;
                else if (max_cycles + p1[i].start < tms)
@@ -404,8 +373,8 @@ ip_frag_lookup(struct rte_ip_frag_tbl *tbl,
                                        p2, i, assoc,
                        IPv6_KEY_BYTES(p2[i].key.src_dst), p2[i].key.id, p2[i].start);
 
-               if (ip_frag_key_cmp(&p2[i].key, key) == 0)
-                       return (p2 + i);
+               if (ip_frag_key_cmp(key, &p2[i].key) == 0)
+                       return p2 + i;
                else if (ip_frag_key_is_empty(&p2[i].key))
                        empty = (empty == NULL) ?( p2 + i) : empty;
                else if (max_cycles + p2[i].start < tms)
@@ -414,5 +383,5 @@ ip_frag_lookup(struct rte_ip_frag_tbl *tbl,
 
        *free = empty;
        *stale = old;
-       return (NULL);
+       return NULL;
 }