Don't need rte_memcpy for fixed size value.
Signed-off-by: Stephen Hemminger <[email protected]>
---
drivers/net/nfp/flower/nfp_conntrack.c | 2 +-
drivers/net/nfp/flower/nfp_flower_flow.c | 16 ++++++++--------
drivers/net/nfp/nfp_mtr.c | 10 +++++-----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/net/nfp/flower/nfp_conntrack.c
b/drivers/net/nfp/flower/nfp_conntrack.c
index 439a1a1b0e..ebb80ae5a7 100644
--- a/drivers/net/nfp/flower/nfp_conntrack.c
+++ b/drivers/net/nfp/flower/nfp_conntrack.c
@@ -1475,7 +1475,7 @@ nfp_ct_do_flow_merge(struct nfp_ct_zone_entry *ze,
merge_entry->ze = ze;
merge_entry->pre_ct_parent = pre_ct_entry;
merge_entry->post_ct_parent = post_ct_entry;
- rte_memcpy(merge_entry->cookie, new_cookie, sizeof(new_cookie));
+ memcpy(merge_entry->cookie, new_cookie, sizeof(new_cookie));
merge_entry->rule.items_cnt = pre_ct_entry->rule.items_cnt +
post_ct_entry->rule.items_cnt - cnt_same_item - 1;
merge_entry->rule.actions_cnt = pre_ct_entry->rule.actions_cnt +
diff --git a/drivers/net/nfp/flower/nfp_flower_flow.c
b/drivers/net/nfp/flower/nfp_flower_flow.c
index ad0fe9a8ef..426fdfe71c 100644
--- a/drivers/net/nfp/flower/nfp_flower_flow.c
+++ b/drivers/net/nfp/flower/nfp_flower_flow.c
@@ -234,10 +234,10 @@ nfp_mask_id_alloc_from_driver(struct nfp_flow_priv *priv,
return -ENOENT;
}
- rte_memcpy(&temp_id, &ring->buf[ring->tail],
NFP_FLOWER_MASK_ELEMENT_RS);
+ memcpy(&temp_id, &ring->buf[ring->tail], NFP_FLOWER_MASK_ELEMENT_RS);
*mask_id = temp_id;
- rte_memcpy(&ring->buf[ring->tail], &freed_id,
NFP_FLOWER_MASK_ELEMENT_RS);
+ memcpy(&ring->buf[ring->tail], &freed_id, NFP_FLOWER_MASK_ELEMENT_RS);
ring->tail = (ring->tail + NFP_FLOWER_MASK_ELEMENT_RS) %
(NFP_FLOWER_MASK_ENTRY_RS * NFP_FLOWER_MASK_ELEMENT_RS);
@@ -256,7 +256,7 @@ nfp_mask_id_free_from_driver(struct nfp_flow_priv *priv,
if (CIRC_SPACE(ring->head, ring->tail, NFP_FLOWER_MASK_ENTRY_RS) == 0)
return -ENOBUFS;
- rte_memcpy(&ring->buf[ring->head], &mask_id,
NFP_FLOWER_MASK_ELEMENT_RS);
+ memcpy(&ring->buf[ring->head], &mask_id, NFP_FLOWER_MASK_ELEMENT_RS);
ring->head = (ring->head + NFP_FLOWER_MASK_ELEMENT_RS) %
(NFP_FLOWER_MASK_ENTRY_RS * NFP_FLOWER_MASK_ELEMENT_RS);
@@ -2929,13 +2929,13 @@ nfp_flow_action_set_mac(char *act_data,
set_mac = action->conf;
if (mac_src_flag) {
- rte_memcpy(&set_eth->eth_addr[RTE_ETHER_ADDR_LEN],
- set_mac->mac_addr, RTE_ETHER_ADDR_LEN);
+ memcpy(&set_eth->eth_addr[RTE_ETHER_ADDR_LEN],
+ set_mac->mac_addr, RTE_ETHER_ADDR_LEN);
for (i = 0; i < RTE_ETHER_ADDR_LEN; i++)
set_eth->eth_addr_mask[RTE_ETHER_ADDR_LEN + i] = 0xff;
} else {
- rte_memcpy(&set_eth->eth_addr[0],
- set_mac->mac_addr, RTE_ETHER_ADDR_LEN);
+ memcpy(&set_eth->eth_addr[0], set_mac->mac_addr,
+ RTE_ETHER_ADDR_LEN);
for (i = 0; i < RTE_ETHER_ADDR_LEN; i++)
set_eth->eth_addr_mask[i] = 0xff;
}
@@ -3011,7 +3011,7 @@ nfp_flow_action_set_ipv6(char *act_data,
set_ip->reserved = 0;
for (i = 0; i < 4; i++) {
- rte_memcpy(&tmp, &set_ipv6->ipv6_addr.a[i * 4], 4);
+ memcpy(&tmp, &set_ipv6->ipv6_addr.a[i * 4], 4);
set_ip->ipv6[i].exact = tmp;
set_ip->ipv6[i].mask = RTE_BE32(0xffffffff);
}
diff --git a/drivers/net/nfp/nfp_mtr.c b/drivers/net/nfp/nfp_mtr.c
index 4833ebd881..8d121f1b7c 100644
--- a/drivers/net/nfp/nfp_mtr.c
+++ b/drivers/net/nfp/nfp_mtr.c
@@ -250,7 +250,7 @@ nfp_mtr_profile_mod(struct nfp_app_fw_flower *app_fw_flower,
struct nfp_profile_conf old_conf;
/* Get the old profile config */
- rte_memcpy(&old_conf, &mtr_profile->conf, sizeof(old_conf));
+ memcpy(&old_conf, &mtr_profile->conf, sizeof(old_conf));
memset(&mtr_profile->conf, 0, sizeof(struct nfp_profile_conf));
@@ -274,7 +274,7 @@ nfp_mtr_profile_mod(struct nfp_app_fw_flower *app_fw_flower,
return 0;
rollback:
- rte_memcpy(&mtr_profile->conf, &old_conf, sizeof(old_conf));
+ memcpy(&mtr_profile->conf, &old_conf, sizeof(old_conf));
return ret;
}
@@ -499,8 +499,8 @@ nfp_mtr_policy_add(struct rte_eth_dev *dev,
}
mtr_policy->policy_id = mtr_policy_id;
- rte_memcpy(&mtr_policy->policy, policy,
- sizeof(struct rte_mtr_meter_policy_params));
+ memcpy(&mtr_policy->policy, policy,
+ sizeof(struct rte_mtr_meter_policy_params));
/* Insert policy into policy list */
LIST_INSERT_HEAD(&priv->policies, mtr_policy, next);
@@ -1035,7 +1035,7 @@ nfp_mtr_stats_read(struct rte_eth_dev *dev,
*stats_mask = mtr->stats_mask;
rte_spinlock_lock(&priv->mtr_stats_lock);
- rte_memcpy(&curr, &mtr->mtr_stats.curr, sizeof(curr));
+ memcpy(&curr, &mtr->mtr_stats.curr, sizeof(curr));
rte_spinlock_unlock(&priv->mtr_stats_lock);
prev = &mtr->mtr_stats.prev;
--
2.53.0
