From owner-p4-projects@FreeBSD.ORG Wed Feb 6 19:09:01 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2B25E43; Wed, 6 Feb 2013 19:09:00 +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 4D26AE41 for ; Wed, 6 Feb 2013 19:09:00 +0000 (UTC) (envelope-from bz@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 0CDF2230 for ; Wed, 6 Feb 2013 19:09:00 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r16J8xYZ080510 for ; Wed, 6 Feb 2013 19:08:59 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r16J8xAE080507 for perforce@freebsd.org; Wed, 6 Feb 2013 19:08:59 GMT (envelope-from bz@freebsd.org) Date: Wed, 6 Feb 2013 19:08:59 GMT Message-Id: <201302061908.r16J8xAE080507@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" Subject: PERFORCE change 221805 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Feb 2013 19:09:01 -0000 http://p4web.freebsd.org/@@221805?ac=10 Change 221805 by bz@bz_zenith on 2013/02/06 19:08:31 Move the factory Ethernet hardware address blacklist checking down to where the test can actually do something useful (and works). Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/atse/if_atse.c#10 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/atse/if_atse.c#10 (text+ko) ==== @@ -688,18 +688,6 @@ sc->atse_eth_addr[2] != 0x00) return (0); - /* Handle factory default ethernet addresss: 00:07:ed:ff:ed:15 */ - if (sc->atse_eth_addr[0] == 0x00 && sc->atse_eth_addr[1] == 0x07 && - sc->atse_eth_addr[2] == 0xed && sc->atse_eth_addr[3] == 0xff && - sc->atse_eth_addr[4] == 0xed && sc->atse_eth_addr[5] == 0x15) { - - device_printf(sc->atse_dev, "Factory programmed Ethernet " - "hardware address blacklisted. Falling back to random " - "address to avoid collisions.\n"); - device_printf(sc->atse_dev, "Please re-program your flash.\n"); - goto get_random; - } - if ((atse_ethernet_option_bits_flag & ATSE_ETHERNET_OPTION_BITS_READ) == 0) goto get_random; @@ -723,6 +711,18 @@ sc->atse_eth_addr[4] = atse_ethernet_option_bits[8]; sc->atse_eth_addr[5] = atse_ethernet_option_bits[9]; + /* Handle factory default ethernet addresss: 00:07:ed:ff:ed:15 */ + if (sc->atse_eth_addr[0] == 0x00 && sc->atse_eth_addr[1] == 0x07 && + sc->atse_eth_addr[2] == 0xed && sc->atse_eth_addr[3] == 0xff && + sc->atse_eth_addr[4] == 0xed && sc->atse_eth_addr[5] == 0x15) { + + device_printf(sc->atse_dev, "Factory programmed Ethernet " + "hardware address blacklisted. Falling back to random " + "address to avoid collisions.\n"); + device_printf(sc->atse_dev, "Please re-program your flash.\n"); + goto get_random; + } + /* * If we find a locally administered address with a 0x0 ending * adjust by device unit. If not and this is not the first