X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fl3fwd%2Fl3fwd_em_hlm_neon.h;h=8aa1c32db602a7d0457a86b9939159a7458a6d2b;hb=a0c21662b4ee323966693093b0f704fa797e3f17;hp=dae1acfb9b284c8837f3dc32398bbd166c6eee40;hpb=569b290cdb3630dadc6827791f960b0df4aa86c5;p=dpdk.git

diff --git a/examples/l3fwd/l3fwd_em_hlm_neon.h b/examples/l3fwd/l3fwd_em_hlm_neon.h
index dae1acfb9b..8aa1c32db6 100644
--- a/examples/l3fwd/l3fwd_em_hlm_neon.h
+++ b/examples/l3fwd/l3fwd_em_hlm_neon.h
@@ -1,35 +1,6 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2016 Intel Corporation. All rights reserved.
- *   Copyright(c) 2017, Linaro Limited
- *   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) 2016-2018 Intel Corporation.
+ * Copyright(c) 2017-2018 Linaro Limited.
  */
 
 #ifndef __L3FWD_EM_HLM_NEON_H__
@@ -42,8 +13,8 @@ get_ipv4_5tuple(struct rte_mbuf *m0, int32x4_t mask0,
 		union ipv4_5tuple_host *key)
 {
 	int32x4_t tmpdata0 = vld1q_s32(rte_pktmbuf_mtod_offset(m0, int32_t *,
-				sizeof(struct ether_hdr) +
-				offsetof(struct ipv4_hdr, time_to_live)));
+				sizeof(struct rte_ether_hdr) +
+				offsetof(struct rte_ipv4_hdr, time_to_live)));
 
 	key->xmm = vandq_s32(tmpdata0, mask0);
 }
@@ -54,18 +25,18 @@ get_ipv6_5tuple(struct rte_mbuf *m0, int32x4_t mask0,
 {
 	int32x4_t tmpdata0 = vld1q_s32(
 			rte_pktmbuf_mtod_offset(m0, int *,
-				sizeof(struct ether_hdr) +
-				offsetof(struct ipv6_hdr, payload_len)));
+				sizeof(struct rte_ether_hdr) +
+				offsetof(struct rte_ipv6_hdr, payload_len)));
 
 	int32x4_t tmpdata1 = vld1q_s32(
-			rte_pktmbuf_mtod_offset(m0, int *,
-				sizeof(struct ether_hdr) +
-				offsetof(struct ipv6_hdr, payload_len) + 8));
+		rte_pktmbuf_mtod_offset(m0, int *,
+			sizeof(struct rte_ether_hdr) +
+			offsetof(struct rte_ipv6_hdr, payload_len) + 8));
 
 	int32x4_t tmpdata2 = vld1q_s32(
-			rte_pktmbuf_mtod_offset(m0, int *,
-				sizeof(struct ether_hdr) +
-				offsetof(struct ipv6_hdr, payload_len) + 16));
+		rte_pktmbuf_mtod_offset(m0, int *,
+			sizeof(struct rte_ether_hdr) +
+			offsetof(struct rte_ipv6_hdr, payload_len) + 16));
 
 	key->xmm[0] = vandq_s32(tmpdata0, mask0);
 	key->xmm[1] = tmpdata1;