From owner-svn-src-all@FreeBSD.ORG  Tue Oct 22 18:14:07 2013
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 8F71669E;
 Tue, 22 Oct 2013 18:14:07 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7CC942CE0;
 Tue, 22 Oct 2013 18:14:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9MIE7RM066917;
 Tue, 22 Oct 2013 18:14:07 GMT (envelope-from ian@svn.freebsd.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9MIE7F1066916;
 Tue, 22 Oct 2013 18:14:07 GMT (envelope-from ian@svn.freebsd.org)
Message-Id: <201310221814.r9MIE7F1066916@svn.freebsd.org>
From: Ian Lepore <ian@FreeBSD.org>
Date: Tue, 22 Oct 2013 18:14:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r256919 - head/sys/dev/ffec
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Tue, 22 Oct 2013 18:14:07 -0000

Author: ian
Date: Tue Oct 22 18:14:06 2013
New Revision: 256919
URL: http://svnweb.freebsd.org/changeset/base/256919

Log:
  Mask out non-address bits in the mac address register, for proper
  detection of an all-zeroes address.  Also remove a misplaced return.
  
  Reviewed by:	br@

Modified:
  head/sys/dev/ffec/if_ffec.c

Modified: head/sys/dev/ffec/if_ffec.c
==============================================================================
--- head/sys/dev/ffec/if_ffec.c	Tue Oct 22 18:07:49 2013	(r256918)
+++ head/sys/dev/ffec/if_ffec.c	Tue Oct 22 18:14:06 2013	(r256919)
@@ -883,7 +883,7 @@ ffec_get_hwaddr(struct ffec_softc *sc, u
 	 * assigned bit set, and the broadcast/multicast bit clear.
 	 */
 	palr = RD4(sc, FEC_PALR_REG);
-	paur = RD4(sc, FEC_PAUR_REG);
+	paur = RD4(sc, FEC_PAUR_REG) & FEC_PAUR_PADDR2_MASK;
 	if ((palr | paur) != 0) {
 		hwaddr[0] = palr >> 24;
 		hwaddr[1] = palr >> 16;
@@ -891,7 +891,6 @@ ffec_get_hwaddr(struct ffec_softc *sc, u
 		hwaddr[3] = palr >>  0;
 		hwaddr[4] = paur >> 24;
 		hwaddr[5] = paur >> 16;
-		return;
 	} else {
 		rnd = arc4random() & 0x00ffffff;
 		hwaddr[0] = 'b';