From owner-svn-src-stable@FreeBSD.ORG  Sun Jan 18 17:07:48 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B19ED106568B;
	Sun, 18 Jan 2009 17:07:48 +0000 (UTC)
	(envelope-from stas@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E3ED8FC14;
	Sun, 18 Jan 2009 17:07:48 +0000 (UTC)
	(envelope-from stas@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0IH7mU2080978;
	Sun, 18 Jan 2009 17:07:48 GMT (envelope-from stas@svn.freebsd.org)
Received: (from stas@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0IH7mHB080977;
	Sun, 18 Jan 2009 17:07:48 GMT (envelope-from stas@svn.freebsd.org)
Message-Id: <200901181707.n0IH7mHB080977@svn.freebsd.org>
From: Stanislav Sedov <stas@FreeBSD.org>
Date: Sun, 18 Jan 2009 17:07:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187398 - in stable/7/sys: . arm/at91 contrib/pf
	dev/ath/ath_hal dev/cxgb
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jan 2009 17:07:49 -0000

Author: stas
Date: Sun Jan 18 17:07:48 2009
New Revision: 187398
URL: http://svn.freebsd.org/changeset/base/187398

Log:
  - MFC r182524 and r182555:
    - Set U/L bit in generate MAC address.
    - Use our specific OUI instead of Atmel one.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/arm/at91/if_ate.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/arm/at91/if_ate.c
==============================================================================
--- stable/7/sys/arm/at91/if_ate.c	Sun Jan 18 15:10:46 2009	(r187397)
+++ stable/7/sys/arm/at91/if_ate.c	Sun Jan 18 17:07:48 2009	(r187398)
@@ -193,19 +193,21 @@ ate_attach(device_t dev)
 
 	if ((err = ate_get_mac(sc, eaddr)) != 0) {
 		/*
-		 * No MAC address configured. Generate the fake one.
+		 * No MAC address configured. Generate the random one.
 		 */
 		if  (bootverbose)
 			device_printf(dev,
-			    "Generating fake ethernet address.\n");
+			    "Generating random ethernet address.\n");
 		rnd = arc4random();
 
 		/*
-		 * Set OUI to Atmel.
+		 * Set OUI to convenient locally assigned address.  'b'
+		 * is 0x62, which has the locally assigned bit set, and
+		 * the broadcast/multicast bit clear.
 		 */
-		eaddr[0] = 0x00;
-		eaddr[1] = 0x04;
-		eaddr[2] = 0x25;
+		eaddr[0] = 'b';
+		eaddr[1] = 's';
+		eaddr[2] = 'd';
 		eaddr[3] = (rnd >> 16) & 0xff;
 		eaddr[4] = (rnd >> 8) & 0xff;
 		eaddr[5] = rnd & 0xff;