Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b4c7a4e authored by Li Yang's avatar Li Yang Committed by Jeff Garzik
Browse files

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: default avatarLi Yang <leoli@freescale.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent a1862a53

drivers/net/ucc_geth.c

+7 −1
Original line number Diff line number Diff line
@@ -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;

}