diff options
author | Joe Perches <joe@perches.com> | 2013-08-01 16:17:49 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-08-02 12:33:54 -0700 |
commit | 1409a93274bb1b17f0b7a0b255a75e80899eec11 (patch) | |
tree | 778099b4c28e9089af438ca53f79613c43617069 /drivers/net/ethernet/nuvoton/w90p910_ether.c | |
parent | 574e2af7c0af3273836def5e66f236521bb433c9 (diff) | |
download | linux-stable-1409a93274bb1b17f0b7a0b255a75e80899eec11.tar.gz linux-stable-1409a93274bb1b17f0b7a0b255a75e80899eec11.tar.bz2 linux-stable-1409a93274bb1b17f0b7a0b255a75e80899eec11.zip |
ethernet: Convert mac address uses of 6 to ETH_ALEN
Use the normal #define to help grep find mac addresses
and ensure that addresses are aligned.
pasemi.h has an unaligned access to mac_addr, unchanged
for now.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Olof Johansson <olof@lixom.net> # pasemi_mac pieces
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/nuvoton/w90p910_ether.c')
-rw-r--r-- | drivers/net/ethernet/nuvoton/w90p910_ether.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/nuvoton/w90p910_ether.c b/drivers/net/ethernet/nuvoton/w90p910_ether.c index e88bdb1aa669..dcfe58fa3b8a 100644 --- a/drivers/net/ethernet/nuvoton/w90p910_ether.c +++ b/drivers/net/ethernet/nuvoton/w90p910_ether.c @@ -922,7 +922,7 @@ static void __init get_mac_address(struct net_device *dev) { struct w90p910_ether *ether = netdev_priv(dev); struct platform_device *pdev; - char addr[6]; + char addr[ETH_ALEN]; pdev = ether->pdev; @@ -934,7 +934,7 @@ static void __init get_mac_address(struct net_device *dev) addr[5] = 0xa8; if (is_valid_ether_addr(addr)) - memcpy(dev->dev_addr, &addr, 0x06); + memcpy(dev->dev_addr, &addr, ETH_ALEN); else dev_err(&pdev->dev, "invalid mac address\n"); } |