diff options
| author |   Damjan Marion <damarion@cisco.com> | 2016-03-13 02:22:06 +0100 |
|---|---|---|
| committer | Damjan Marion <damarion@cisco.com> | 2016-04-22 17:29:47 +0200 |
| commit | f1213b82771ce929c076339c24a777cfd59690e6 (patch) | |
| tree | 3c74305e8848047d8ccd1228ee511d57cbf1b1a6 /vnet/vnet/map/ip6_map.c | |
| parent | 2b836cf4d1e4e59ca34229a9fdf49d79216da20e (diff) | |
Add clib_memcpy macro based on DPDK rte_memcpy implementation
Change-Id: I22cb443c4bd0bf298abb6f06e8e4ca65a44a2854
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vnet/vnet/map/ip6_map.c')
| -rw-r--r-- | vnet/vnet/map/ip6_map.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vnet/vnet/map/ip6_map.c b/vnet/vnet/map/ip6_map.c index 208f45f521c..694d249472e 100644 --- a/vnet/vnet/map/ip6_map.c +++ b/vnet/vnet/map/ip6_map.c @@ -453,7 +453,7 @@ ip6_map_ip6_reass_prepare(vlib_main_t *vm, vlib_node_runtime_t *node, map_ip6_re if (ip6_frag_hdr_offset(frag0)) { //Not first fragment, add the IPv4 header - memcpy(ip40, &r->ip4_header, 20); + clib_memcpy(ip40, &r->ip4_header, 20); } #ifdef MAP_IP6_REASS_COUNT_BYTES @@ -462,7 +462,7 @@ ip6_map_ip6_reass_prepare(vlib_main_t *vm, vlib_node_runtime_t *node, map_ip6_re if (ip6_frag_hdr_more(frag0)) { //Not last fragment, we copy end of next - memcpy(u8_ptr_add(ip60, p0->current_length), r->fragments[i].next_data, 20); + clib_memcpy(u8_ptr_add(ip60, p0->current_length), r->fragments[i].next_data, 20); p0->current_length += 20; ip60->payload_length = u16_net_add(ip60->payload_length, 20); } @@ -760,11 +760,11 @@ ip6_map_ip4_reass (vlib_main_t *vm, from = vlib_frame_vector_args(frame); u32 len = vec_len(fragments_to_loopback); if(len <= VLIB_FRAME_SIZE) { - memcpy(from, fragments_to_loopback, sizeof(u32)*len); + clib_memcpy(from, fragments_to_loopback, sizeof(u32)*len); n_left_from = len; vec_reset_length(fragments_to_loopback); } else { - memcpy(from, fragments_to_loopback + (len - VLIB_FRAME_SIZE), sizeof(u32)*VLIB_FRAME_SIZE); + clib_memcpy(from, fragments_to_loopback + (len - VLIB_FRAME_SIZE), sizeof(u32)*VLIB_FRAME_SIZE); n_left_from = VLIB_FRAME_SIZE; _vec_len(fragments_to_loopback) = len - VLIB_FRAME_SIZE; } |