diff options
| author |   Luka Perkov <luka@openwrt.org> | 2013-10-30 00:11:00 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-10-29 22:52:45 -0400 |
| commit | 99470819b1a89f77c1eb44f6b3328c1aeb2c87d0 (patch) | |
| tree | 13d824fd0ba6d9bc3d76f7f4bcb144c4c1bd285c /drivers/net/ethernet/arc/emac_main.c | |
| parent | mvneta: drop redundant mac address check (diff) | |
| download | linux-dev-99470819b1a89f77c1eb44f6b3328c1aeb2c87d0.tar.xz linux-dev-99470819b1a89f77c1eb44f6b3328c1aeb2c87d0.zip | |
arc_emac: drop redundant mac address check
Checking if MAC address is valid using is_valid_ether_addr() is already done in
of_get_mac_address(). While at it, reorganize checking so it matches checks in
other drivers.
Signed-off-by: Luka Perkov <luka@openwrt.org>
CC: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
CC: David Miller <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/arc/emac_main.c')
| -rw-r--r-- | drivers/net/ethernet/arc/emac_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/emac_main.c index 9e1601487263..d818ded6c05c 100644 --- a/drivers/net/ethernet/arc/emac_main.c +++ b/drivers/net/ethernet/arc/emac_main.c @@ -725,10 +725,10 @@ static int arc_emac_probe(struct platform_device *pdev) /* Get MAC address from device tree */ mac_addr = of_get_mac_address(pdev->dev.of_node); - if (!mac_addr || !is_valid_ether_addr(mac_addr)) - eth_hw_addr_random(ndev); - else + if (mac_addr) memcpy(ndev->dev_addr, mac_addr, ETH_ALEN); + else + eth_hw_addr_random(ndev); dev_info(&pdev->dev, "MAC address is now %pM\n", ndev->dev_addr); |