Commit a5fd22eb authored by Olof Johansson's avatar Olof Johansson Committed by Jeff Garzik
Browse files

pasemi_mac: Use local-mac-address instead of mac-address if available 



Use local-mac-address in the device tree instead. Fall back to mac-address
for older firmware.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent bb6e9590

drivers/net/pasemi_mac.c

+6 −1
Original line number Diff line number Diff line
@@ -94,7 +94,12 @@ static int pasemi_get_mac_addr(struct pasemi_mac *mac) 
		return -ENOENT;

	}



	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");