From: Danny Kukawka <danny.kukawka@bisect.de>
To: "David S. Miller" <davem@davemloft.net>
Cc: Danny Kukawka <dkukawka@suse.de>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
Jiri Pirko <jpirko@redhat.com>,
Wan ZongShun <mcuos.com@gmail.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 01/10] au1000_eth: use eth_hw_addr_random() instead of random_ether_addr()
Date: Fri, 17 Feb 2012 16:43:22 +0100 [thread overview]
Message-ID: <1329493411-25750-2-git-send-email-danny.kukawka@bisect.de> (raw)
In-Reply-To: <1329493411-25750-1-git-send-email-danny.kukawka@bisect.de>
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(-)
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;
--
1.7.8.3
next prev parent reply other threads:[~2012-02-17 15:46 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-17 15:43 [PATCH v2 00/10] Part 4: handle addr_assign_type for random addresses Danny Kukawka
2012-02-17 15:43 ` Danny Kukawka [this message]
2012-02-17 20:59 ` [PATCH v2 01/10] au1000_eth: use eth_hw_addr_random() instead of random_ether_addr() David Miller
2012-02-17 15:43 ` [PATCH 02/10] lantiq_etop: set addr_assign_type if random_ether_addr() used Danny Kukawka
2012-02-17 21:00 ` David Miller
2012-02-17 21:24 ` Danny Kukawka
2012-02-17 15:43 ` [PATCH v2 03/10] davinci_emac: use eth_hw_addr_random() instead of random_ether_addr() Danny Kukawka
2012-02-17 21:00 ` David Miller
2012-02-17 15:43 ` [PATCH v2 04/10] xilinx ll_temac: " Danny Kukawka
2012-02-17 21:00 ` David Miller
2012-02-17 15:43 ` [PATCH v2 05/10] igbvf: reset netdevice addr_assign_type if changed Danny Kukawka
2012-02-17 21:01 ` David Miller
2012-02-17 15:43 ` [PATCH v2 06/10] batman-adv: use eth_hw_addr_random() instead of random_ether_addr() Danny Kukawka
2012-02-17 21:01 ` David Miller
2012-02-17 15:43 ` [PATCH v2 07/10] cisco/enic: " Danny Kukawka
2012-02-17 21:01 ` David Miller
2012-02-17 21:35 ` Danny Kukawka
2012-02-17 15:43 ` [PATCH v2 08/10] ethoc: set addr_assign_type if random_ether_addr() used Danny Kukawka
2012-02-17 21:02 ` David Miller
2012-02-17 15:43 ` [PATCH v2 09/10] atheros eth: " Danny Kukawka
2012-02-17 21:02 ` David Miller
2012-02-17 15:43 ` [PATCH 10/10] UML net: " Danny Kukawka
2012-02-17 15:55 ` Richard Weinberger
2012-02-17 20:17 ` David Miller
2012-02-17 21:05 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1329493411-25750-2-git-send-email-danny.kukawka@bisect.de \
--to=danny.kukawka@bisect.de \
--cc=davem@davemloft.net \
--cc=dkukawka@suse.de \
--cc=jeffrey.t.kirsher@intel.com \
--cc=jpirko@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mcuos.com@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®