From: olof@lixom.net (Olof Johansson)
To: jgarzik@pobox.com
Cc: netdev@vger.kernel.org
Subject: [RESEND] [PATCH v2] [5/5] pasemi_mac: use local-mac-address
Date: Sat, 28 Apr 2007 00:52:05 -0500 [thread overview]
Message-ID: <20070428055205.GF22074@lixom.net> (raw)
In-Reply-To: <20070428054952.GA22074@lixom.net>
Use local-mac-address in the device tree instead. Fall back to mac-address
for older firmware.
Signed-off-by: Olof Johansson <olof@lixom.net>
Index: powerpc/drivers/net/pasemi_mac.c
===================================================================
--- powerpc.orig/drivers/net/pasemi_mac.c
+++ powerpc/drivers/net/pasemi_mac.c
@@ -74,7 +74,12 @@ static int pasemi_get_mac_addr(struct pa
return -ENOENT;
}
- maddr = get_property(dn, "mac-address", NULL);
+ maddr = get_property(dn, "local-mac-address", NULL);
+
+ /* Fall back to mac-address for older firmware */
+ if (maddr == NULL)
+ maddr = get_property(dn, "mac-address", NULL);
+
if (maddr == NULL) {
dev_warn(&pdev->dev,
"no mac address in device tree, not configuring\n");
prev parent reply other threads:[~2007-04-28 5:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-28 5:49 [RESEND] [PATCH v2] [0/5] pasemi_mac: fixes and enhancements Olof Johansson
2007-04-28 5:50 ` [RESEND] [PATCH v2] [1/5] pasemi_mac: minor bugfixes Olof Johansson
2007-04-28 15:20 ` Jeff Garzik
2007-04-28 16:17 ` Olof Johansson
2007-04-28 5:50 ` [RESEND] [PATCH v2] [2/5] pasemi_mac: irq mapping changes Olof Johansson
2007-04-28 5:51 ` [RESEND] [PATCH v2] [3/5] pasemi_mac: cleanups and rx performance improvements Olof Johansson
2007-04-28 15:22 ` Jeff Garzik
2007-04-28 20:08 ` Olof Johansson
2007-04-28 5:51 ` [RESEND] [PATCH v2] [4/5] pasemi_mac: phy support Olof Johansson
2007-04-28 15:23 ` Jeff Garzik
2007-04-28 20:09 ` Olof Johansson
2007-04-28 5:52 ` Olof Johansson [this message]
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=20070428055205.GF22074@lixom.net \
--to=olof@lixom.net \
--cc=jgarzik@pobox.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;
as well as URLs for NNTP newsgroup(s).