Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 102879
b: refs/heads/master
c: d1d5741
h: refs/heads/master
i:
  102877: 8893893
  102875: 9cf5447
  102871: c4eaeca
  102863: 6666f1e
  102847: 09fa224
v: v3
  • Loading branch information
Sven Schnelle authored and Jeff Garzik committed Jun 12, 2008
1 parent f6eaade commit 40c9101
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 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: 86a74ff21a7ac4bc06b18076ddb0347712b46cfd
refs/heads/master: d1d5741d8568c268ec234a5b35af4a04498be6d8
6 changes: 5 additions & 1 deletion trunk/drivers/net/macb.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,12 @@ static void __init macb_get_hwaddr(struct macb *bp)
addr[4] = top & 0xff;
addr[5] = (top >> 8) & 0xff;

if (is_valid_ether_addr(addr))
if (is_valid_ether_addr(addr)) {
memcpy(bp->dev->dev_addr, addr, sizeof(addr));
} else {
dev_info(&bp->pdev->dev, "invalid hw address, using random\n");
random_ether_addr(bp->dev->dev_addr);
}
}

static int macb_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
Expand Down

0 comments on commit 40c9101

Please sign in to comment.