diff options
| author | Joe Perches <joe@perches.com> | 2013-10-01 22:04:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-02 17:04:45 -0400 |
| commit | d458cdf712e0c671e8e819abb16ecd6e44f9daec (patch) | |
| tree | ff93ce90fee219f2690a4f51f985815422664b7a /drivers/net/ethernet/broadcom/tg3.c | |
| parent | 0b3d8e087bbee2a4e3f479d538a7edd3f1d2950c (diff) | |
net:drivers/net: Miscellaneous conversions to ETH_ALEN
Convert the memset/memcpy uses of 6 to ETH_ALEN
where appropriate.
Also convert some struct definitions and u8 array
declarations of [6] to ETH_ALEN.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/tg3.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index a17a3c93e398..498569e99a1c 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c | |||
| @@ -13214,8 +13214,8 @@ static int tg3_run_loopback(struct tg3 *tp, u32 pktsz, bool tso_loopback) | |||
| 13214 | return -ENOMEM; | 13214 | return -ENOMEM; |
| 13215 | 13215 | ||
| 13216 | tx_data = skb_put(skb, tx_len); | 13216 | tx_data = skb_put(skb, tx_len); |
| 13217 | memcpy(tx_data, tp->dev->dev_addr, 6); | 13217 | memcpy(tx_data, tp->dev->dev_addr, ETH_ALEN); |
| 13218 | memset(tx_data + 6, 0x0, 8); | 13218 | memset(tx_data + ETH_ALEN, 0x0, 8); |
| 13219 | 13219 | ||
| 13220 | tw32(MAC_RX_MTU_SIZE, tx_len + ETH_FCS_LEN); | 13220 | tw32(MAC_RX_MTU_SIZE, tx_len + ETH_FCS_LEN); |
| 13221 | 13221 | ||
| @@ -16661,8 +16661,8 @@ static int tg3_get_macaddr_sparc(struct tg3 *tp) | |||
| 16661 | int len; | 16661 | int len; |
| 16662 | 16662 | ||
| 16663 | addr = of_get_property(dp, "local-mac-address", &len); | 16663 | addr = of_get_property(dp, "local-mac-address", &len); |
| 16664 | if (addr && len == 6) { | 16664 | if (addr && len == ETH_ALEN) { |
| 16665 | memcpy(dev->dev_addr, addr, 6); | 16665 | memcpy(dev->dev_addr, addr, ETH_ALEN); |
| 16666 | return 0; | 16666 | return 0; |
| 16667 | } | 16667 | } |
| 16668 | return -ENODEV; | 16668 | return -ENODEV; |
| @@ -16672,7 +16672,7 @@ static int tg3_get_default_macaddr_sparc(struct tg3 *tp) | |||
| 16672 | { | 16672 | { |
| 16673 | struct net_device *dev = tp->dev; | 16673 | struct net_device *dev = tp->dev; |
| 16674 | 16674 | ||
| 16675 | memcpy(dev->dev_addr, idprom->id_ethaddr, 6); | 16675 | memcpy(dev->dev_addr, idprom->id_ethaddr, ETH_ALEN); |
| 16676 | return 0; | 16676 | return 0; |
| 16677 | } | 16677 | } |
| 16678 | #endif | 16678 | #endif |
