diff options
| -rw-r--r-- | drivers/net/arm/ep93xx_eth.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c index 2be49c817995..b25467ac895c 100644 --- a/drivers/net/arm/ep93xx_eth.c +++ b/drivers/net/arm/ep93xx_eth.c | |||
| @@ -628,15 +628,6 @@ static int ep93xx_open(struct net_device *dev) | |||
| 628 | if (ep93xx_alloc_buffers(ep)) | 628 | if (ep93xx_alloc_buffers(ep)) |
| 629 | return -ENOMEM; | 629 | return -ENOMEM; |
| 630 | 630 | ||
| 631 | if (is_zero_ether_addr(dev->dev_addr)) { | ||
| 632 | random_ether_addr(dev->dev_addr); | ||
| 633 | printk(KERN_INFO "%s: generated random MAC address " | ||
| 634 | "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x.\n", dev->name, | ||
| 635 | dev->dev_addr[0], dev->dev_addr[1], | ||
| 636 | dev->dev_addr[2], dev->dev_addr[3], | ||
| 637 | dev->dev_addr[4], dev->dev_addr[5]); | ||
| 638 | } | ||
| 639 | |||
| 640 | napi_enable(&ep->napi); | 631 | napi_enable(&ep->napi); |
| 641 | 632 | ||
| 642 | if (ep93xx_start_hw(dev)) { | 633 | if (ep93xx_start_hw(dev)) { |
| @@ -877,6 +868,9 @@ static int ep93xx_eth_probe(struct platform_device *pdev) | |||
| 877 | ep->mii.mdio_write = ep93xx_mdio_write; | 868 | ep->mii.mdio_write = ep93xx_mdio_write; |
| 878 | ep->mdc_divisor = 40; /* Max HCLK 100 MHz, min MDIO clk 2.5 MHz. */ | 869 | ep->mdc_divisor = 40; /* Max HCLK 100 MHz, min MDIO clk 2.5 MHz. */ |
| 879 | 870 | ||
| 871 | if (is_zero_ether_addr(dev->dev_addr)) | ||
| 872 | random_ether_addr(dev->dev_addr); | ||
| 873 | |||
| 880 | err = register_netdev(dev); | 874 | err = register_netdev(dev); |
| 881 | if (err) { | 875 | if (err) { |
| 882 | dev_err(&pdev->dev, "Failed to register netdev\n"); | 876 | dev_err(&pdev->dev, "Failed to register netdev\n"); |
