New upstream version 18.02

[deb_dpdk.git] / examples / ip_pipeline / pipeline / pipeline_routing_be.c

diff --git a/examples/ip_pipeline/pipeline/pipeline_routing_be.c b/examples/ip_pipeline/pipeline/pipeline_routing_be.c
index 21ac788..6258a1a 100644 (file)
--- a/examples/ip_pipeline/pipeline/pipeline_routing_be.c
+++ b/examples/ip_pipeline/pipeline/pipeline_routing_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>
@@ -191,7 +162,7 @@ struct layout {
        dst->c = src->c;                                        \
 }
 
-static inline __attribute__((always_inline)) void
+static __rte_always_inline void
 pkt_work_routing(
        struct rte_mbuf *pkt,
        struct rte_pipeline_table_entry *table_entry,
@@ -317,7 +288,7 @@ pkt_work_routing(
        }
 }
 
-static inline __attribute__((always_inline)) void
+static __rte_always_inline void
 pkt4_work_routing(
        struct rte_mbuf **pkts,
        struct rte_pipeline_table_entry **table_entries,
@@ -1349,17 +1320,20 @@ pipeline_routing_init(struct pipeline_params *params,
 
        /* ARP table configuration */
        if (p_rt->params.n_arp_entries) {
-               struct rte_table_hash_key8_ext_params table_arp_params = {
-                       .n_entries = p_rt->params.n_arp_entries,
-                       .n_entries_ext = p_rt->params.n_arp_entries,
+               struct rte_table_hash_params table_arp_params = {
+                       .name = p->name,
+                       .key_size = 8,
+                       .key_offset = p_rt->params.arp_key_offset,
+                       .key_mask = NULL,
+                       .n_keys = p_rt->params.n_arp_entries,
+                       .n_buckets =
+                               rte_align32pow2(p_rt->params.n_arp_entries / 4),
                        .f_hash = hash_default_key8,
                        .seed = 0,
-                       .signature_offset = 0, /* Unused */
-                       .key_offset = p_rt->params.arp_key_offset,
                };
 
                struct rte_pipeline_table_params table_params = {
-                       .ops = &rte_table_hash_key8_ext_dosig_ops,
+                       .ops = &rte_table_hash_key8_ext_ops,
                        .arg_create = &table_arp_params,
                        .f_action_hit = get_arp_table_ah_hit(p_rt),
                        .f_action_miss = NULL,