diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-05-14 08:04:30 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-05-14 08:04:30 +1000 |
| commit | d833109a952e45baf3da422434172aec60b990b1 (patch) | |
| tree | 1f7bd056a74ae6db5c2377308cc209e18f3d9530 /drivers/net/ethernet/freescale/fs_enet | |
| parent | 191c07583e44d6d7e80126643c09195eab84fe35 (diff) | |
| parent | d4c26eb6e721683a0f93e346ce55bc8dc3cbb175 (diff) | |
| download | linux-next-d833109a952e45baf3da422434172aec60b990b1.tar.gz | |
Merge remote-tracking branch 'net/master'
Diffstat (limited to 'drivers/net/ethernet/freescale/fs_enet')
| -rw-r--r-- | drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c index 90ea7a115d0f..5fad73b2e123 100644 --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c @@ -1015,7 +1015,7 @@ static int fs_enet_probe(struct platform_device *ofdev) mac_addr = of_get_mac_address(ofdev->dev.of_node); if (!IS_ERR(mac_addr)) - memcpy(ndev->dev_addr, mac_addr, ETH_ALEN); + ether_addr_copy(ndev->dev_addr, mac_addr); ret = fep->ops->allocate_bd(ndev); if (ret) |