diff options
author | Joe Perches <joe@perches.com> | 2013-08-01 19:17:49 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-08-02 15:33:54 -0400 |
commit | 1409a93274bb1b17f0b7a0b255a75e80899eec11 (patch) | |
tree | 778099b4c28e9089af438ca53f79613c43617069 /drivers/net/ethernet/8390 | |
parent | 574e2af7c0af3273836def5e66f236521bb433c9 (diff) |
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/8390')
-rw-r--r-- | drivers/net/ethernet/8390/ax88796.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c index e1d26433d619..b7232a9b7756 100644 --- a/drivers/net/ethernet/8390/ax88796.c +++ b/drivers/net/ethernet/8390/ax88796.c | |||
@@ -707,7 +707,7 @@ static int ax_init_dev(struct net_device *dev) | |||
707 | 707 | ||
708 | #ifdef CONFIG_AX88796_93CX6 | 708 | #ifdef CONFIG_AX88796_93CX6 |
709 | if (ax->plat->flags & AXFLG_HAS_93CX6) { | 709 | if (ax->plat->flags & AXFLG_HAS_93CX6) { |
710 | unsigned char mac_addr[6]; | 710 | unsigned char mac_addr[ETH_ALEN]; |
711 | struct eeprom_93cx6 eeprom; | 711 | struct eeprom_93cx6 eeprom; |
712 | 712 | ||
713 | eeprom.data = ei_local; | 713 | eeprom.data = ei_local; |
@@ -719,7 +719,7 @@ static int ax_init_dev(struct net_device *dev) | |||
719 | (__le16 __force *)mac_addr, | 719 | (__le16 __force *)mac_addr, |
720 | sizeof(mac_addr) >> 1); | 720 | sizeof(mac_addr) >> 1); |
721 | 721 | ||
722 | memcpy(dev->dev_addr, mac_addr, 6); | 722 | memcpy(dev->dev_addr, mac_addr, ETH_ALEN); |
723 | } | 723 | } |
724 | #endif | 724 | #endif |
725 | if (ax->plat->wordlength == 2) { | 725 | if (ax->plat->wordlength == 2) { |