From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 28BB3A0032; Sat, 18 Jun 2022 16:09:59 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BA90E40F35; Sat, 18 Jun 2022 16:09:58 +0200 (CEST) Received: from m12-14.163.com (m12-14.163.com [220.181.12.14]) by mails.dpdk.org (Postfix) with ESMTP id 9815B40F19 for ; Sat, 18 Jun 2022 16:09:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=OWHknDj8reABIZ17// wBG69HZ69BD1jwRXFswXtSb+E=; b=halap+k6sSJ7+LCjWDbeLvFjYETwdVoHcb Ei1hjjk6S+MJDbPgpqSLe/R90aTMyVsdt+JxRTF//6vLm0cvvkkRPXlMVWjSRAh0 N3SX29eHVw6OKHJEjFzyIftZ0pnSpKf3GoY1k1pfCg63oIt46KhhhdVSDtNPdDZF esyM0hHc0= Received: from localhost.localdomain.localdomain (unknown [120.244.160.165]) by smtp10 (Coremail) with SMTP id DsCowABnhv+n3K1i5DUDIg--.33072S2; Sat, 18 Jun 2022 22:09:46 +0800 (CST) From: Huichao Cai To: dev@dpdk.org Cc: konstantin.ananyev@intel.com Subject: [PATCH] ip_frag: replace the rte memcpy with memcpy Date: Sat, 18 Jun 2022 22:09:40 +0800 Message-Id: <1655561380-64616-1-git-send-email-chcchc88@163.com> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: DsCowABnhv+n3K1i5DUDIg--.33072S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxJw17WF48XFWfuFW3Zw1DZFb_yoWrXF4UpF sxJryktrs5XF4DG3s7XFsavrWFyFn2qF1UK3s5Cws3JFn3A34xta93GryrGrnxKa95ur9F vw4xJF15WrsrW3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jr4SrUUUUU= X-Originating-IP: [120.244.160.165] X-CM-SenderInfo: pfkfuxrfyyqiywtou0bp/1tbitx4kF1aEREXM+QAAs8 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org To resolve the compilation warning,replace the rte_memcpy with memcpy. Modify in file test_ipfrag.c and rte_ipv4_fragmentation.c. Signed-off-by: Huichao Cai --- app/test/test_ipfrag.c | 13 ++++++------- lib/ip_frag/rte_ipv4_fragmentation.c | 7 +++---- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/app/test/test_ipfrag.c b/app/test/test_ipfrag.c index dc62b0e..ba0ffd0 100644 --- a/app/test/test_ipfrag.c +++ b/app/test/test_ipfrag.c @@ -23,7 +23,6 @@ #include #include -#include #include #define NUM_MBUFS 128 @@ -147,13 +146,13 @@ static void ut_teardown(void) if (opt_copied) { expected_opt->len = sizeof(expected_first_frag_ipv4_opts_copied); - rte_memcpy(expected_opt->data, + memcpy(expected_opt->data, expected_first_frag_ipv4_opts_copied, sizeof(expected_first_frag_ipv4_opts_copied)); } else { expected_opt->len = sizeof(expected_first_frag_ipv4_opts_nocopied); - rte_memcpy(expected_opt->data, + memcpy(expected_opt->data, expected_first_frag_ipv4_opts_nocopied, sizeof(expected_first_frag_ipv4_opts_nocopied)); } @@ -161,13 +160,13 @@ static void ut_teardown(void) if (opt_copied) { expected_opt->len = sizeof(expected_sub_frag_ipv4_opts_copied); - rte_memcpy(expected_opt->data, + memcpy(expected_opt->data, expected_sub_frag_ipv4_opts_copied, sizeof(expected_sub_frag_ipv4_opts_copied)); } else { expected_opt->len = sizeof(expected_sub_frag_ipv4_opts_nocopied); - rte_memcpy(expected_opt->data, + memcpy(expected_opt->data, expected_sub_frag_ipv4_opts_nocopied, sizeof(expected_sub_frag_ipv4_opts_nocopied)); } @@ -227,7 +226,7 @@ static void ut_teardown(void) hdr->src_addr = rte_cpu_to_be_32(0x8080808); hdr->dst_addr = rte_cpu_to_be_32(0x8080404); - rte_memcpy(hdr + 1, opt.data, opt.len); + memcpy(hdr + 1, opt.data, opt.len); } static void @@ -312,7 +311,7 @@ static void ut_teardown(void) char *iph_opt = rte_pktmbuf_mtod_offset(mb[i], char *, sizeof(struct rte_ipv4_hdr)); opt->len = opt_len; - rte_memcpy(opt->data, iph_opt, opt_len); + memcpy(opt->data, iph_opt, opt_len); } else { opt->len = RTE_IPV4_HDR_OPT_MAX_LEN; memset(opt->data, RTE_IPV4_HDR_OPT_EOL, diff --git a/lib/ip_frag/rte_ipv4_fragmentation.c b/lib/ip_frag/rte_ipv4_fragmentation.c index a19f6fd..27a8ad2 100644 --- a/lib/ip_frag/rte_ipv4_fragmentation.c +++ b/lib/ip_frag/rte_ipv4_fragmentation.c @@ -5,7 +5,6 @@ #include #include -#include #include #include "ip_frag_common.h" @@ -26,7 +25,7 @@ static inline void __fill_ipv4hdr_frag(struct rte_ipv4_hdr *dst, const struct rte_ipv4_hdr *src, uint16_t header_len, uint16_t len, uint16_t fofs, uint16_t dofs, uint32_t mf) { - rte_memcpy(dst, src, header_len); + memcpy(dst, src, header_len); fofs = (uint16_t)(fofs + (dofs >> RTE_IPV4_HDR_FO_SHIFT)); fofs = (uint16_t)(fofs | mf << RTE_IPV4_HDR_MF_SHIFT); dst->fragment_offset = rte_cpu_to_be_16(fofs); @@ -48,7 +47,7 @@ static inline uint16_t __create_ipopt_frag_hdr(uint8_t *iph, struct rte_ipv4_hdr *iph_opt = (struct rte_ipv4_hdr *)ipopt_frag_hdr; ipopt_len = 0; - rte_memcpy(ipopt_frag_hdr, iph, sizeof(struct rte_ipv4_hdr)); + memcpy(ipopt_frag_hdr, iph, sizeof(struct rte_ipv4_hdr)); ipopt_frag_hdr += sizeof(struct rte_ipv4_hdr); uint8_t *p_opt = iph + sizeof(struct rte_ipv4_hdr); @@ -65,7 +64,7 @@ static inline uint16_t __create_ipopt_frag_hdr(uint8_t *iph, break; if (RTE_IPV4_HDR_OPT_COPIED(*p_opt)) { - rte_memcpy(ipopt_frag_hdr + ipopt_len, + memcpy(ipopt_frag_hdr + ipopt_len, p_opt, p_opt[1]); ipopt_len += p_opt[1]; } -- 1.8.3.1