ixgbevf: use ether_addr_copy instead of memcpy

Orabug: 23177316

replace some instances of memcpy for setting up the mac address with
ether_addr_copy()

Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Darin Miller <darin.j.miller@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 91a76baadec1f30e8441c3d52c2559468a4da693)
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 934a923aabe6fcd3761c171c1917a876233f5355..3b3e49c0d918dfb4deac7e383a608c448100af42 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -2258,10 +2258,8 @@ void ixgbevf_reset(struct ixgbevf_adapter *adapter)
        }
 
        if (is_valid_ether_addr(adapter->hw.mac.addr)) {
-               memcpy(netdev->dev_addr, adapter->hw.mac.addr,
-                      netdev->addr_len);
-               memcpy(netdev->perm_addr, adapter->hw.mac.addr,
-                      netdev->addr_len);
+               ether_addr_copy(netdev->dev_addr, adapter->hw.mac.addr);
+               ether_addr_copy(netdev->perm_addr, adapter->hw.mac.addr);
        }
 
        adapter->last_reset = jiffies;
@@ -2660,13 +2658,13 @@ static int ixgbevf_sw_init(struct ixgbevf_adapter *adapter)
                else if (is_zero_ether_addr(adapter->hw.mac.addr))
                        dev_info(&pdev->dev,
                                 "MAC address not assigned by administrator.\n");
-               memcpy(netdev->dev_addr, hw->mac.addr, netdev->addr_len);
+               ether_addr_copy(netdev->dev_addr, hw->mac.addr);
        }
 
        if (!is_valid_ether_addr(netdev->dev_addr)) {
                dev_info(&pdev->dev, "Assigning random MAC address\n");
                eth_hw_addr_random(netdev);
-               memcpy(hw->mac.addr, netdev->dev_addr, netdev->addr_len);
+               ether_addr_copy(hw->mac.addr, netdev->dev_addr);
        }
 
        /* Enable dynamic interrupt throttling rates */
@@ -3696,8 +3694,8 @@ static int ixgbevf_set_mac(struct net_device *netdev, void *p)
        if (!is_valid_ether_addr(addr->sa_data))
                return -EADDRNOTAVAIL;
 
-       memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
-       memcpy(hw->mac.addr, addr->sa_data, netdev->addr_len);
+       ether_addr_copy(netdev->dev_addr, addr->sa_data);
+       ether_addr_copy(hw->mac.addr, addr->sa_data);
 
        spin_lock_bh(&adapter->mbx_lock);