There is no point in using rte_memcpy to copy Ethernet addresses.
Use rte_ether_addr_copy() instead.

Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
 drivers/net/tap/rte_eth_tap.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 36b06b3ac5..da45610665 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -15,7 +15,6 @@
 #include <rte_net.h>
 #include <rte_debug.h>
 #include <rte_ip.h>
-#include <rte_string_fns.h>
 #include <rte_ethdev.h>
 #include <rte_errno.h>
 #include <rte_cycles.h>
@@ -1395,11 +1394,13 @@ tap_mac_set(struct rte_eth_dev *dev, struct 
rte_ether_addr *mac_addr)
                        mac_addr))
                mode = LOCAL_AND_REMOTE;
        ifr.ifr_hwaddr.sa_family = AF_LOCAL;
-       rte_memcpy(ifr.ifr_hwaddr.sa_data, mac_addr, RTE_ETHER_ADDR_LEN);
+
+       rte_ether_addr_copy(mac_addr, (struct rte_ether_addr 
*)&ifr.ifr_hwaddr.sa_data);
        ret = tap_ioctl(pmd, SIOCSIFHWADDR, &ifr, 1, mode);
        if (ret < 0)
                return ret;
-       rte_memcpy(&pmd->eth_addr, mac_addr, RTE_ETHER_ADDR_LEN);
+
+       rte_ether_addr_copy(mac_addr, &pmd->eth_addr);
 
 #ifdef HAVE_TCA_FLOWER
        if (pmd->remote_if_index && !pmd->flow_isolate) {
@@ -1987,7 +1988,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const 
char *tap_name,
                if (rte_is_zero_ether_addr(mac_addr))
                        rte_eth_random_addr((uint8_t *)&pmd->eth_addr);
                else
-                       rte_memcpy(&pmd->eth_addr, mac_addr, sizeof(*mac_addr));
+                       rte_ether_addr_copy(mac_addr, &pmd->eth_addr);
        }
 
        /*
@@ -2010,8 +2011,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const 
char *tap_name,
        if (pmd->type == ETH_TUNTAP_TYPE_TAP) {
                memset(&ifr, 0, sizeof(struct ifreq));
                ifr.ifr_hwaddr.sa_family = AF_LOCAL;
-               rte_memcpy(ifr.ifr_hwaddr.sa_data, &pmd->eth_addr,
-                               RTE_ETHER_ADDR_LEN);
+               rte_ether_addr_copy(&pmd->eth_addr, (struct rte_ether_addr 
*)&ifr.ifr_hwaddr.sa_data);
                if (tap_ioctl(pmd, SIOCSIFHWADDR, &ifr, 0, LOCAL_ONLY) < 0)
                        goto error_exit;
        }
@@ -2070,8 +2070,8 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const 
char *tap_name,
                                pmd->name, pmd->remote_iface);
                        goto error_remote;
                }
-               rte_memcpy(&pmd->eth_addr, ifr.ifr_hwaddr.sa_data,
-                          RTE_ETHER_ADDR_LEN);
+
+               rte_ether_addr_copy((struct rte_ether_addr 
*)&ifr.ifr_hwaddr.sa_data, &pmd->eth_addr);
                /* The desired MAC is already in ifreq after SIOCGIFHWADDR. */
                if (tap_ioctl(pmd, SIOCSIFHWADDR, &ifr, 0, LOCAL_ONLY) < 0) {
                        TAP_LOG(ERR, "%s: failed to get %s MAC address.",
-- 
2.45.2

Reply via email to