From owner-svn-src-all@FreeBSD.ORG  Fri Jan  8 10:32:27 2010
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 EFC241065696;
	Fri,  8 Jan 2010 10:32:27 +0000 (UTC)
	(envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D286F8FC1F;
	Fri,  8 Jan 2010 10:32:27 +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 o08AWR7m045969;
	Fri, 8 Jan 2010 10:32:27 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o08AWROo045967;
	Fri, 8 Jan 2010 10:32:27 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201001081032.o08AWROo045967@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Fri, 8 Jan 2010 10:32:27 +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: r201781 - head/sys/dev/jme
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, 08 Jan 2010 10:32:28 -0000

Author: gavin
Date: Fri Jan  8 10:32:27 2010
New Revision: 201781
URL: http://svn.freebsd.org/changeset/base/201781

Log:
  If we fail to read the Ethernet address from the card, just print an
  warning message and attach without setting the Ethernet address to a
  random address.  It is not believed that this code can actually be
  executed, and if it does, we're better off printing an error message than
  faking up an Ethernet address.
  
  PR:		kern/133239
  Reviewed by:	yongari (earlier version of patch)
  Approved by:	ed (mentor)

Modified:
  head/sys/dev/jme/if_jme.c

Modified: head/sys/dev/jme/if_jme.c
==============================================================================
--- head/sys/dev/jme/if_jme.c	Fri Jan  8 10:15:11 2010	(r201780)
+++ head/sys/dev/jme/if_jme.c	Fri Jan  8 10:32:27 2010	(r201781)
@@ -462,15 +462,7 @@ jme_reg_macaddr(struct jme_softc *sc)
 	if ((par0 == 0 && par1 == 0) ||
 	    (par0 == 0xFFFFFFFF && par1 == 0xFFFF)) {
 		device_printf(sc->jme_dev,
-		    "generating fake ethernet address.\n");
-		par0 = arc4random();
-		/* Set OUI to JMicron. */
-		sc->jme_eaddr[0] = 0x02;	/* U/L bit set. */
-		sc->jme_eaddr[1] = 0x1B;
-		sc->jme_eaddr[2] = 0x8C;
-		sc->jme_eaddr[3] = (par0 >> 16) & 0xff;
-		sc->jme_eaddr[4] = (par0 >> 8) & 0xff;
-		sc->jme_eaddr[5] = par0 & 0xff;
+		    "Failed to retrieve Ethernet address.\n");
 	} else {
 		sc->jme_eaddr[0] = (par0 >> 0) & 0xFF;
 		sc->jme_eaddr[1] = (par0 >> 8) & 0xFF;