From: Li Yang Date: Thu, 8 Feb 2007 09:35:54 +0000 (+0800) Subject: ucc_geth: Add support to local-mac-address property X-Git-Tag: v2.6.21-rc1~83^2~66^2~1 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b4c7a4ec988d9b8bbe847f3c983938220e3a38b;p=linux-2.6 ucc_geth: Add support to local-mac-address property IEEE-1275 defines “local-mac-address” to be a standard property name to specify preassigned network address. This patch adds support for it. Signed-off-by: Li Yang Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index db0370affb..31c97a6591 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c @@ -4072,6 +4072,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma static int mii_mng_configured = 0; const phandle *ph; const unsigned int *prop; + const void *mac_addr; ugeth_vdbg("%s: IN", __FUNCTION__); @@ -4197,7 +4198,12 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma ugeth->ug_info = ug_info; ugeth->dev = dev; - memcpy(dev->dev_addr, get_property(np, "mac-address", NULL), 6); + + mac_addr = get_property(np, "mac-address", NULL); + if (mac_addr == NULL) + mac_addr = get_property(np, "local-mac-address", NULL); + if (mac_addr) + memcpy(dev->dev_addr, mac_addr, 6); return 0; }