Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-block.git] / drivers / net / ethernet / freescale / gianfar.c

diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index df13c693b03850b23c357b98997c3f29fff289cb..e670cd293dbab9db54daf51037ac13ea58c8d8c2 100644 (file)
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -873,7 +873,7 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
        mac_addr = of_get_mac_address(np);
 
        if (!IS_ERR(mac_addr))
-               memcpy(dev->dev_addr, mac_addr, ETH_ALEN);
+               ether_addr_copy(dev->dev_addr, mac_addr);
 
        if (model && !strcasecmp(model, "TSEC"))
                priv->device_flags |= FSL_GIANFAR_DEV_HAS_GIGABIT |