Message ID | 1329493411-25750-2-git-send-email-danny.kukawka@bisect.de |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Danny Kukawka <danny.kukawka@bisect.de> Date: Fri, 17 Feb 2012 16:43:22 +0100 > Use eth_hw_addr_random() instead of calling random_ether_addr() > to set addr_assign_type correctly to NET_ADDR_RANDOM. > > v2: adapt to eth_hw_addr_random() > > Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de> Please don't shit up the comments: > - /* set a random MAC now in case platform_data doesn't provide one */ ... > + /*set a random MAC since no valid provided by platform_data*/ You had to work to make that comment look worse than it originally did in the code, spaces around the sentence and if you can be so bothered capitalize sentences and put proper punctionation at the end. I took care of this, but I will not next time. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/amd/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c index 8b95dd3..8793daa 100644 --- a/drivers/net/ethernet/amd/au1000_eth.c +++ b/drivers/net/ethernet/amd/au1000_eth.c @@ -1130,9 +1130,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; @@ -1142,8 +1139,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;
Use eth_hw_addr_random() instead of calling random_ether_addr() to set addr_assign_type correctly to NET_ADDR_RANDOM. v2: adapt to eth_hw_addr_random() Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de> --- drivers/net/ethernet/amd/au1000_eth.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)