net/mlx5: remove unnecessary memory barrier

[dpdk.git] / examples / ip_pipeline / pipeline / pipeline_passthrough_be.c

diff --git a/examples/ip_pipeline/pipeline/pipeline_passthrough_be.c b/examples/ip_pipeline/pipeline/pipeline_passthrough_be.c
index 8b71a7d..b2bbaed 100644 (file)
--- a/examples/ip_pipeline/pipeline/pipeline_passthrough_be.c
+++ b/examples/ip_pipeline/pipeline/pipeline_passthrough_be.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2016 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-2016 Intel Corporation
  */
 
 #include <stdio.h>
@@ -76,7 +47,7 @@ static pipeline_msg_req_handler handlers[] = {
                pipeline_msg_req_invalid_handler,
 };
 
-static inline __attribute__((always_inline)) void
+static __rte_always_inline void
 pkt_work_dma(
        struct rte_mbuf *pkt,
        void *arg,
@@ -102,7 +73,7 @@ pkt_work_dma(
 
        /* Read (dma_dst), compute (hash), write (hash) */
        if (hash_enabled) {
-               uint32_t hash = p->f_hash(dma_dst, dma_size, 0);
+               uint32_t hash = p->f_hash(dma_src, dma_mask, dma_size, 0);
                *dma_hash = hash;
 
                if (lb_hash) {
@@ -121,7 +92,7 @@ pkt_work_dma(
        }
 }
 
-static inline __attribute__((always_inline)) void
+static __rte_always_inline void
 pkt4_work_dma(
        struct rte_mbuf **pkts,
        void *arg,
@@ -173,10 +144,10 @@ pkt4_work_dma(
 
        /* Read (dma_dst), compute (hash), write (hash) */
        if (hash_enabled) {
-               uint32_t hash0 = p->f_hash(dma_dst0, dma_size, 0);
-               uint32_t hash1 = p->f_hash(dma_dst1, dma_size, 0);
-               uint32_t hash2 = p->f_hash(dma_dst2, dma_size, 0);
-               uint32_t hash3 = p->f_hash(dma_dst3, dma_size, 0);
+               uint32_t hash0 = p->f_hash(dma_src0, dma_mask, dma_size, 0);
+               uint32_t hash1 = p->f_hash(dma_src1, dma_mask, dma_size, 0);
+               uint32_t hash2 = p->f_hash(dma_src2, dma_mask, dma_size, 0);
+               uint32_t hash3 = p->f_hash(dma_src3, dma_mask, dma_size, 0);
 
                *dma_hash0 = hash0;
                *dma_hash1 = hash1;
@@ -217,7 +188,7 @@ pkt4_work_dma(
        }
 }
 
-static inline __attribute__((always_inline)) void
+static __rte_always_inline void
 pkt_work_swap(
        struct rte_mbuf *pkt,
        void *arg)
@@ -241,7 +212,7 @@ pkt_work_swap(
        }
 }
 
-static inline __attribute__((always_inline)) void
+static __rte_always_inline void
 pkt4_work_swap(
        struct rte_mbuf **pkts,
        void *arg)
@@ -589,7 +560,7 @@ pipeline_passthrough_parse_args(struct pipeline_passthrough_params *p,
                                params->name, arg_name);
                        dma_hash_lb_present = 1;
 
-                       if (strcmp(arg_value, "hash") ||
+                       if (strcmp(arg_value, "hash") &&
                                strcmp(arg_value, "HASH"))
 
                                PIPELINE_PARSE_ERR_INV_VAL(0,