Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 168970
b: refs/heads/master
c: 3c91c7a
h: refs/heads/master
v: v3
  • Loading branch information
Florian Fainelli authored and David S. Miller committed Nov 30, 2009
1 parent 0f8f613 commit 6fbaf47
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d5ccd67bb77ced5249067d05171992a7d5020393
refs/heads/master: 3c91c7ae84966f992429e1e128c4936f22b89064
12 changes: 3 additions & 9 deletions trunk/drivers/net/arm/ep93xx_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -628,15 +628,6 @@ static int ep93xx_open(struct net_device *dev)
if (ep93xx_alloc_buffers(ep))
return -ENOMEM;

if (is_zero_ether_addr(dev->dev_addr)) {
random_ether_addr(dev->dev_addr);
printk(KERN_INFO "%s: generated random MAC address "
"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x.\n", dev->name,
dev->dev_addr[0], dev->dev_addr[1],
dev->dev_addr[2], dev->dev_addr[3],
dev->dev_addr[4], dev->dev_addr[5]);
}

napi_enable(&ep->napi);

if (ep93xx_start_hw(dev)) {
Expand Down Expand Up @@ -877,6 +868,9 @@ static int ep93xx_eth_probe(struct platform_device *pdev)
ep->mii.mdio_write = ep93xx_mdio_write;
ep->mdc_divisor = 40; /* Max HCLK 100 MHz, min MDIO clk 2.5 MHz. */

if (is_zero_ether_addr(dev->dev_addr))
random_ether_addr(dev->dev_addr);

err = register_netdev(dev);
if (err) {
dev_err(&pdev->dev, "Failed to register netdev\n");
Expand Down

0 comments on commit 6fbaf47

Please sign in to comment.