From 51d1d8080b537451ac0da5a96279ce6942187e9f Mon Sep 17 00:00:00 2001 From: Danny Kukawka Date: Fri, 17 Feb 2012 05:43:22 +0000 Subject: [PATCH] --- yaml --- r: 290198 b: refs/heads/master c: 7718f2c27dbdae0b22b2268a9c1b38edf0d8fa16 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/amd/au1000_eth.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5348b1bc5fec..4382b7d11bd9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ccdca7775968145d4218bf7e240bf48f7ed9cea +refs/heads/master: 7718f2c27dbdae0b22b2268a9c1b38edf0d8fa16 diff --git a/trunk/drivers/net/ethernet/amd/au1000_eth.c b/trunk/drivers/net/ethernet/amd/au1000_eth.c index c1dfdc8b7079..397596b078d9 100644 --- a/trunk/drivers/net/ethernet/amd/au1000_eth.c +++ b/trunk/drivers/net/ethernet/amd/au1000_eth.c @@ -1129,9 +1129,6 @@ static int __devinit au1000_probe(struct platform_device *pdev) au1000_setup_hw_rings(aup, aup->macdma); - /* set a random MAC now in case platform_data doesn't provide one */ - random_ether_addr(dev->dev_addr); - writel(0, aup->enable); aup->mac_enabled = 0; @@ -1141,8 +1138,12 @@ static int __devinit au1000_probe(struct platform_device *pdev) " PHY search on MAC0\n"); aup->phy1_search_mac0 = 1; } else { - if (is_valid_ether_addr(pd->mac)) + if (is_valid_ether_addr(pd->mac)) { memcpy(dev->dev_addr, pd->mac, 6); + } else { + /* Set a random MAC since no valid provided by platform_data. */ + eth_hw_addr_random(dev); + } aup->phy_static_config = pd->phy_static_config; aup->phy_search_highest_addr = pd->phy_search_highest_addr;