ixgbevf: use ether_addr_copy instead of memcpy
authorEmil Tantilov <emil.s.tantilov@intel.com>
Mon, 12 Oct 2015 17:55:51 +0000 (10:55 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Mon, 23 Nov 2015 19:08:51 +0000 (11:08 -0800)
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>
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

index 1b15f9578adf8d0eb591a7a0ad29d435daa3b7aa..47c71e1fe1ce6d5b04891fc00e63a7e079d5e22a 100644 (file)
@@ -2260,10 +2260,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;
@@ -2659,13 +2657,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 */
@@ -3695,8 +3693,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);