PERFORCE change 222820 for review

[Brooks Davis]

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

Change 222820 by brooks at 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 "