net: add rte prefix to ether structures

[dpdk.git] / examples / l3fwd / l3fwd_em_sequential.h

diff --git a/examples/l3fwd/l3fwd_em_sequential.h b/examples/l3fwd/l3fwd_em_sequential.h
index cb7c2ab..770660e 100644 (file)
--- a/examples/l3fwd/l3fwd_em_sequential.h
+++ b/examples/l3fwd/l3fwd_em_sequential.h
@@ -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
  */
 
 #ifndef __L3FWD_EM_SEQUENTIAL_H__
@@ -51,7 +22,7 @@
 
 static __rte_always_inline uint16_t
 em_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
-               uint8_t portid)
+               uint16_t portid)
 {
        uint8_t next_hop;
        struct ipv4_hdr *ipv4_hdr;
@@ -66,7 +37,7 @@ em_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
 
                /* Handle IPv4 headers.*/
                ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct ipv4_hdr *,
-                               sizeof(struct ether_hdr));
+                               sizeof(struct rte_ether_hdr));
 
                next_hop = em_get_ipv4_dst_port(ipv4_hdr, portid,
                                qconf->ipv4_lookup_struct);
@@ -81,7 +52,7 @@ em_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
 
                /* Handle IPv6 headers.*/
                ipv6_hdr = rte_pktmbuf_mtod_offset(pkt, struct ipv6_hdr *,
-                               sizeof(struct ether_hdr));
+                               sizeof(struct rte_ether_hdr));
 
                next_hop = em_get_ipv6_dst_port(ipv6_hdr, portid,
                                qconf->ipv6_lookup_struct);
@@ -103,20 +74,21 @@ em_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
  */
 static inline void
 l3fwd_em_send_packets(int nb_rx, struct rte_mbuf **pkts_burst,
-                       uint8_t portid, struct lcore_conf *qconf)
+                       uint16_t portid, struct lcore_conf *qconf)
 {
        int32_t i, j;
        uint16_t dst_port[MAX_PKT_BURST];
 
        if (nb_rx > 0) {
                rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[0],
-                                              struct ether_hdr *) + 1);
+                                              struct rte_ether_hdr *) + 1);
        }
 
        for (i = 1, j = 0; j < nb_rx; i++, j++) {
                if (i < nb_rx) {
-                       rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[i],
-                                                      struct ether_hdr *) + 1);
+                       rte_prefetch0(rte_pktmbuf_mtod(
+                                       pkts_burst[i],
+                                       struct rte_ether_hdr *) + 1);
                }
                dst_port[j] = em_get_dst_port(qconf, pkts_burst[j], portid);
        }