The driver use of memcpy is for control path work, for example, flow configuration and so is fine using the standard libc memcpy function in place of the DPDK-specific rte_memcpy version.
Signed-off-by: Bruce Richardson <[email protected]> --- drivers/net/intel/e1000/em_rxtx.c | 1 - drivers/net/intel/e1000/igb_flow.c | 8 ++++---- drivers/net/intel/e1000/igb_pf.c | 5 ++--- drivers/net/intel/e1000/igb_rxtx.c | 1 - 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/net/intel/e1000/em_rxtx.c b/drivers/net/intel/e1000/em_rxtx.c index 54971fe285..5879013a1d 100644 --- a/drivers/net/intel/e1000/em_rxtx.c +++ b/drivers/net/intel/e1000/em_rxtx.c @@ -20,7 +20,6 @@ #include <rte_pci.h> #include <bus_pci_driver.h> #include <rte_memory.h> -#include <rte_memcpy.h> #include <rte_memzone.h> #include <rte_launch.h> #include <rte_eal.h> diff --git a/drivers/net/intel/e1000/igb_flow.c b/drivers/net/intel/e1000/igb_flow.c index ea9b290e1c..ca76bf5ae4 100644 --- a/drivers/net/intel/e1000/igb_flow.c +++ b/drivers/net/intel/e1000/igb_flow.c @@ -1484,7 +1484,7 @@ igb_flow_create(struct rte_eth_dev *dev, goto out; } - rte_memcpy(&ntuple_filter_ptr->filter_info, + memcpy(&ntuple_filter_ptr->filter_info, &ntuple_filter, sizeof(struct rte_eth_ntuple_filter)); TAILQ_INSERT_TAIL(&igb_filter_ntuple_list, @@ -1511,7 +1511,7 @@ igb_flow_create(struct rte_eth_dev *dev, goto out; } - rte_memcpy(ðertype_filter_ptr->filter_info, + memcpy(ðertype_filter_ptr->filter_info, ðertype_filter, sizeof(struct rte_eth_ethertype_filter)); TAILQ_INSERT_TAIL(&igb_filter_ethertype_list, @@ -1536,7 +1536,7 @@ igb_flow_create(struct rte_eth_dev *dev, goto out; } - rte_memcpy(&syn_filter_ptr->filter_info, + memcpy(&syn_filter_ptr->filter_info, &syn_filter, sizeof(struct rte_eth_syn_filter)); TAILQ_INSERT_TAIL(&igb_filter_syn_list, @@ -1562,7 +1562,7 @@ igb_flow_create(struct rte_eth_dev *dev, goto out; } - rte_memcpy(&flex_filter_ptr->filter_info, + memcpy(&flex_filter_ptr->filter_info, &flex_filter, sizeof(struct igb_flex_filter)); TAILQ_INSERT_TAIL(&igb_filter_flex_list, diff --git a/drivers/net/intel/e1000/igb_pf.c b/drivers/net/intel/e1000/igb_pf.c index c7588ea57e..a3327e0bf0 100644 --- a/drivers/net/intel/e1000/igb_pf.c +++ b/drivers/net/intel/e1000/igb_pf.c @@ -17,7 +17,6 @@ #include <rte_eal.h> #include <rte_ether.h> #include <ethdev_driver.h> -#include <rte_memcpy.h> #include <rte_malloc.h> #include <rte_random.h> @@ -290,7 +289,7 @@ igb_vf_reset(struct rte_eth_dev *dev, uint16_t vf, uint32_t *msgbuf) /* reply to reset with ack and vf mac address */ msgbuf[0] = E1000_VF_RESET | E1000_VT_MSGTYPE_ACK; - rte_memcpy(new_mac, vf_mac, RTE_ETHER_ADDR_LEN); + memcpy(new_mac, vf_mac, RTE_ETHER_ADDR_LEN); e1000_write_mbx(hw, msgbuf, 3, vf); return 0; @@ -308,7 +307,7 @@ igb_vf_set_mac_addr(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf) if (rte_is_unicast_ether_addr((struct rte_ether_addr *)new_mac)) { if (!rte_is_zero_ether_addr((struct rte_ether_addr *)new_mac)) - rte_memcpy(vfinfo[vf].vf_mac_addresses, new_mac, + memcpy(vfinfo[vf].vf_mac_addresses, new_mac, sizeof(vfinfo[vf].vf_mac_addresses)); hw->mac.ops.rar_set(hw, new_mac, rar_entry); rah = E1000_READ_REG(hw, E1000_RAH(rar_entry)); diff --git a/drivers/net/intel/e1000/igb_rxtx.c b/drivers/net/intel/e1000/igb_rxtx.c index 14b2858817..4fda5d57a0 100644 --- a/drivers/net/intel/e1000/igb_rxtx.c +++ b/drivers/net/intel/e1000/igb_rxtx.c @@ -19,7 +19,6 @@ #include <rte_debug.h> #include <rte_pci.h> #include <rte_memory.h> -#include <rte_memcpy.h> #include <rte_memzone.h> #include <rte_launch.h> #include <rte_eal.h> -- 2.51.0
