New upstream version 18.02

[deb_dpdk.git] / examples / ip_pipeline / init.c

diff --git a/examples/ip_pipeline/init.c b/examples/ip_pipeline/init.c
index e56e404..bb07efa 100644 (file)
--- a/examples/ip_pipeline/init.c
+++ b/examples/ip_pipeline/init.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 <inttypes.h>
@@ -876,10 +847,10 @@ app_init_link_frag_ras(struct app_params *app)
        uint32_t i;
 
        if (is_any_swq_frag_or_ras(app)) {
-               for (i = 0; i < app->n_pktq_hwq_out; i++) {
-                       struct app_pktq_hwq_out_params *p_txq = &app->hwq_out_params[i];
-
-                       p_txq->conf.txq_flags &= ~ETH_TXQ_FLAGS_NOMULTSEGS;
+               for (i = 0; i < app->n_links; i++) {
+                       struct app_link_params *p_link = &app->link_params[i];
+                               p_link->conf.txmode.offloads |=
+                                               DEV_TX_OFFLOAD_MULTI_SEGS;
                }
        }
 }
@@ -962,6 +933,7 @@ app_init_link(struct app_params *app)
 
        for (i = 0; i < app->n_links; i++) {
                struct app_link_params *p_link = &app->link_params[i];
+               struct rte_eth_dev_info dev_info;
                uint32_t link_id, n_hwq_in, n_hwq_out, j;
                int status;
 
@@ -978,6 +950,10 @@ app_init_link(struct app_params *app)
                        n_hwq_out);
 
                /* LINK */
+               rte_eth_dev_info_get(p_link->pmd_id, &dev_info);
+               if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
+                       p_link->conf.txmode.offloads |=
+                               DEV_TX_OFFLOAD_MBUF_FAST_FREE;
                status = rte_eth_dev_configure(
                        p_link->pmd_id,
                        n_hwq_in,
@@ -1019,6 +995,7 @@ app_init_link(struct app_params *app)
                                        p_rxq->name,
                                        status);
 
+                       p_rxq->conf.offloads = p_link->conf.rxmode.offloads;
                        status = rte_eth_rx_queue_setup(
                                p_link->pmd_id,
                                rxq_queue_id,
@@ -1060,6 +1037,7 @@ app_init_link(struct app_params *app)
                                        p_txq->name,
                                        status);
 
+                       p_txq->conf.offloads = p_link->conf.txmode.offloads;
                        status = rte_eth_tx_queue_setup(
                                p_link->pmd_id,
                                txq_queue_id,
@@ -1726,7 +1704,7 @@ app_init_pipelines(struct app_params *app)
                data->ptype = ptype;
 
                data->timer_period = (rte_get_tsc_hz() *
-                       params->timer_period) / 100;
+                       params->timer_period) / 1000;
        }
 }