From: Daniel Mack <daniel@caiaq.de>
Date: Wed, 8 Apr 2009 11:23:37 +0000 (+0200)
Subject: smc911x: write back the manually set MAC address
X-Git-Tag: v2009.06-rc3~15
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2c0234fa79122a5aa77c4e17c33eb2fe184b61a7;p=oweals%2Fu-boot.git

smc911x: write back the manually set MAC address

If the MAX address is given by the environment, write it back to the
hardware.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
---

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 30f2dc266b..8c9a2a8a05 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -41,8 +41,13 @@ static int smx911x_handle_mac_address(bd_t *bd)
 	unsigned long addrh, addrl;
 	uchar m[6];
 
-	/* if the environment has a valid mac address then use it */
-	if (!eth_getenv_enetaddr("ethaddr", m)) {
+	if (eth_getenv_enetaddr("ethaddr", m)) {
+		/* if the environment has a valid mac address then use it */
+		addrl = m[0] | (m[1] << 8) | (m[2] << 16) | (m[3] << 24);
+		addrh = m[4] | (m[5] << 8);
+		smc911x_set_mac_csr(ADDRL, addrl);
+		smc911x_set_mac_csr(ADDRH, addrh);
+	} else {
 		/* if not, try to get one from the eeprom */
 		addrh = smc911x_get_mac_csr(ADDRH);
 		addrl = smc911x_get_mac_csr(ADDRL);