From owner-svn-src-all@FreeBSD.ORG  Fri Jan 28 23:40:13 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9F8CB10656BD;
	Fri, 28 Jan 2011 23:40:13 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8E9158FC17;
	Fri, 28 Jan 2011 23:40:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0SNeDh9004818;
	Fri, 28 Jan 2011 23:40:13 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0SNeDIk004816;
	Fri, 28 Jan 2011 23:40:13 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201101282340.p0SNeDIk004816@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Fri, 28 Jan 2011 23:40:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218050 - head/sys/dev/tsec
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Jan 2011 23:40:13 -0000

Author: marcel
Date: Fri Jan 28 23:40:13 2011
New Revision: 218050
URL: http://svn.freebsd.org/changeset/base/218050

Log:
  Don't use the MAC address in the device tree if it's all zeroes
  (i.e. 00-00-00-00-00-00). Use the currently programmed address
  instead.
  
  While here, simplify the function.

Modified:
  head/sys/dev/tsec/if_tsec_fdt.c

Modified: head/sys/dev/tsec/if_tsec_fdt.c
==============================================================================
--- head/sys/dev/tsec/if_tsec_fdt.c	Fri Jan 28 22:35:46 2011	(r218049)
+++ head/sys/dev/tsec/if_tsec_fdt.c	Fri Jan 28 23:40:13 2011	(r218050)
@@ -320,17 +320,15 @@ tsec_get_hwaddr(struct tsec_softc *sc, u
 	union {
 		uint32_t reg[2];
 		uint8_t addr[6];
-	} curmac;
-	uint32_t a[6];
-	uint8_t lma[6];
+	} hw;
 	int i;
 
-	/*
-	 * Retrieve hw address from the device tree.
-	 */
-	i = OF_getprop(sc->node, "local-mac-address", (void *)lma, 6);
-	if (i == 6) {
-		bcopy(lma, addr, 6);
+	hw.reg[0] = hw.reg[1] = 0;
+
+	/* Retrieve the hardware address from the device tree. */
+	i = OF_getprop(sc->node, "local-mac-address", (void *)hw.addr, 6);
+	if (i == 6 && (hw.reg[0] != 0 || hw.reg[1] != 0)) {
+		bcopy(hw.addr, addr, 6);
 		return;
 	}
 
@@ -338,15 +336,8 @@ tsec_get_hwaddr(struct tsec_softc *sc, u
 	 * Fall back -- use the currently programmed address in the hope that
 	 * it was set be firmware...
 	 */
-	curmac.reg[0] = TSEC_READ(sc, TSEC_REG_MACSTNADDR1);
-	curmac.reg[1] = TSEC_READ(sc, TSEC_REG_MACSTNADDR2);
+	hw.reg[0] = TSEC_READ(sc, TSEC_REG_MACSTNADDR1);
+	hw.reg[1] = TSEC_READ(sc, TSEC_REG_MACSTNADDR2);
 	for (i = 0; i < 6; i++)
-		a[5-i] = curmac.addr[i];
-
-	addr[0] = a[0];
-	addr[1] = a[1];
-	addr[2] = a[2];
-	addr[3] = a[3];
-	addr[4] = a[4];
-	addr[5] = a[5];
+		addr[5-i] = hw.addr[i];
 }