From owner-p4-projects@FreeBSD.ORG  Tue Mar 12 22:02:36 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 8B206132; Tue, 12 Mar 2013 22:02:36 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 4CE70130
 for <perforce@freebsd.org>; Tue, 12 Mar 2013 22:02:36 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3B991ABC
 for <perforce@freebsd.org>; Tue, 12 Mar 2013 22:02:36 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2CM2agX007284
 for <perforce@freebsd.org>; Tue, 12 Mar 2013 22:02:36 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2CM2anI007281
 for perforce@freebsd.org; Tue, 12 Mar 2013 22:02:36 GMT
 (envelope-from brooks@freebsd.org)
Date: Tue, 12 Mar 2013 22:02:36 GMT
Message-Id: <201303122202.r2CM2anI007281@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 222820 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Mar 2013 22:02:36 -0000

http://p4web.freebsd.org/@@222820?ac=10

Change 222820 by brooks@brooks_zenith on 2013/03/12 22:01:54

	When our stored MAC address uses an Altera prefix and ends in
	0x0, then use it for up to the first 16 units.  Previously we
	did this if it was locally administred and ended in 0x0 but
	Cambridge sysadmins don't want the LA bit set.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/atse/if_atse.c#14 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/atse/if_atse.c#14 (text+ko) ====

@@ -727,7 +727,7 @@
 	}
 
 	/*
-	 * If we find a locally administered address with a 0x0 ending
+	 * If we find an Altera prefixed address with a 0x0 ending
 	 * adjust by device unit.  If not and this is not the first
 	 * Ethernet, go to random.
 	 */
@@ -741,7 +741,8 @@
 		    "random hadware address.\n");
 		goto get_random;
 	}
-	if ((sc->atse_eth_addr[0] & 0x2) == 0 ||
+	if ((sc->atse_eth_addr[0] & ~0x2) != 0 ||
+	    sc->atse_eth_addr[1] != 0x07 || sc->atse_eth_addr[2] != 0xed ||
 	    (sc->atse_eth_addr[5] & 0x0f) != 0x0) {
 		device_printf(sc->atse_dev, "Ethernet address not meeting our "
 		    "multi-MAC standards. Falling back to random hadware "