diff options
Diffstat (limited to 'drivers/net/ethernet/sun/sunhme.c')
-rw-r--r-- | drivers/net/ethernet/sun/sunhme.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c index e37b587b3860..99043b74bf2b 100644 --- a/drivers/net/ethernet/sun/sunhme.c +++ b/drivers/net/ethernet/sun/sunhme.c | |||
@@ -2675,10 +2675,10 @@ static int happy_meal_sbus_probe_one(struct platform_device *op, int is_qfe) | |||
2675 | 2675 | ||
2676 | addr = of_get_property(dp, "local-mac-address", &len); | 2676 | addr = of_get_property(dp, "local-mac-address", &len); |
2677 | 2677 | ||
2678 | if (qfe_slot != -1 && addr && len == 6) | 2678 | if (qfe_slot != -1 && addr && len == ETH_ALEN) |
2679 | memcpy(dev->dev_addr, addr, 6); | 2679 | memcpy(dev->dev_addr, addr, ETH_ALEN); |
2680 | else | 2680 | else |
2681 | memcpy(dev->dev_addr, idprom->id_ethaddr, 6); | 2681 | memcpy(dev->dev_addr, idprom->id_ethaddr, ETH_ALEN); |
2682 | } | 2682 | } |
2683 | 2683 | ||
2684 | hp = netdev_priv(dev); | 2684 | hp = netdev_priv(dev); |
@@ -3024,9 +3024,9 @@ static int happy_meal_pci_probe(struct pci_dev *pdev, | |||
3024 | (addr = of_get_property(dp, "local-mac-address", &len)) | 3024 | (addr = of_get_property(dp, "local-mac-address", &len)) |
3025 | != NULL && | 3025 | != NULL && |
3026 | len == 6) { | 3026 | len == 6) { |
3027 | memcpy(dev->dev_addr, addr, 6); | 3027 | memcpy(dev->dev_addr, addr, ETH_ALEN); |
3028 | } else { | 3028 | } else { |
3029 | memcpy(dev->dev_addr, idprom->id_ethaddr, 6); | 3029 | memcpy(dev->dev_addr, idprom->id_ethaddr, ETH_ALEN); |
3030 | } | 3030 | } |
3031 | #else | 3031 | #else |
3032 | get_hme_mac_nonsparc(pdev, &dev->dev_addr[0]); | 3032 | get_hme_mac_nonsparc(pdev, &dev->dev_addr[0]); |