Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 327619
b: refs/heads/master
c: 1f7c9ae
h: refs/heads/master
i:
  327617: 0899add
  327615: 188fe70
v: v3
  • Loading branch information
Wei Yongjun authored and David S. Miller committed Aug 24, 2012
1 parent 91a4df2 commit 3eac2cb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 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: d68bb7e1a65f2604156958ae03a556b6a207514b
refs/heads/master: 1f7c9ae7a014d994c01a7dd59333f2fcef2aba58
3 changes: 1 addition & 2 deletions trunk/drivers/net/ethernet/wiznet/w5300.c
Original file line number Diff line number Diff line change
Expand Up @@ -557,8 +557,7 @@ static int __devinit w5300_hw_probe(struct platform_device *pdev)
if (data && is_valid_ether_addr(data->mac_addr)) {
memcpy(ndev->dev_addr, data->mac_addr, ETH_ALEN);
} else {
eth_random_addr(ndev->dev_addr);
ndev->addr_assign_type |= NET_ADDR_RANDOM;
eth_hw_addr_random(ndev);
}

mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
Expand Down

0 comments on commit 3eac2cb

Please sign in to comment.