diff --git a/[refs] b/[refs] index ed1c281b39e8..6c71aa3012b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f2e154b68b9321d958391bc0b1ffc2b90d57d71 +refs/heads/master: 85e6b8c5d8be1e901b5402bfe42ce408912ab83e diff --git a/trunk/drivers/net/dm9000.c b/trunk/drivers/net/dm9000.c index 2d4c4fc1d900..c30935587207 100644 --- a/trunk/drivers/net/dm9000.c +++ b/trunk/drivers/net/dm9000.c @@ -1592,10 +1592,15 @@ dm9000_probe(struct platform_device *pdev) ndev->dev_addr[i] = ior(db, i+DM9000_PAR); } - if (!is_valid_ether_addr(ndev->dev_addr)) + if (!is_valid_ether_addr(ndev->dev_addr)) { dev_warn(db->dev, "%s: Invalid ethernet MAC address. Please " "set using ifconfig\n", ndev->name); + random_ether_addr(ndev->dev_addr); + mac_src = "random"; + } + + platform_set_drvdata(pdev, ndev); ret = register_netdev(ndev);