]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
fm10k: use ether_addr_copy to copy MAC address
authorJacob Keller <jacob.e.keller@intel.com>
Mon, 26 Oct 2015 23:32:02 +0000 (16:32 -0700)
committerTim Gardner <tim.gardner@canonical.com>
Mon, 29 Feb 2016 15:57:32 +0000 (08:57 -0700)
BugLink: http://bugs.launchpad.net/bugs/1536475
Use the ether_addr_copy function instead of copying byte-by-byte in a
for-loop by hand.

Reported-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit f0cf5c98981353563b929801100c30071f0eeefb)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
drivers/net/ethernet/intel/fm10k/fm10k_pf.c

index 8b9b6ba5b92bfb76ff2efa95f2c07160af65611a..bbf0b4aef241c55427449eca89c5ff506a280eea 100644 (file)
@@ -266,7 +266,6 @@ static s32 fm10k_read_mac_addr_pf(struct fm10k_hw *hw)
 {
        u8 perm_addr[ETH_ALEN];
        u32 serial_num;
-       int i;
 
        serial_num = fm10k_read_reg(hw, FM10K_SM_AREA(1));
 
@@ -288,10 +287,8 @@ static s32 fm10k_read_mac_addr_pf(struct fm10k_hw *hw)
        perm_addr[4] = (u8)(serial_num >> 8);
        perm_addr[5] = (u8)(serial_num);
 
-       for (i = 0; i < ETH_ALEN; i++) {
-               hw->mac.perm_addr[i] = perm_addr[i];
-               hw->mac.addr[i] = perm_addr[i];
-       }
+       ether_addr_copy(hw->mac.perm_addr, perm_addr);
+       ether_addr_copy(hw->mac.addr, perm_addr);
 
        return 0;
 }