 @@ -1,14 +1,14 @@
-/*	$NetBSD: pq3etsec.c,v 1.11 2012/04/19 21:32:01 matt Exp $	*/
+/*	$NetBSD: pq3etsec.c,v 1.12 2012/04/20 13:51:48 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Raytheon BBN Technologies Corp and Defense Advanced Research Projects
  * Agency and which was developed by Matt Thomas of 3am Software Foundry.
+ *
  * This material is based upon work supported by the Defense Advanced Research
  * Projects Agency and Space and Naval Warfare Systems Center, Pacific, under
  * Contract No. N66001-09-C-2073.
  * Approved for Public Release, Distribution Unlimited
+ *
 @@ -28,27 +28,27 @@
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "opt_inet.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.11 2012/04/19 21:32:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.12 2012/04/20 13:51:48 matt Exp $");
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/mbuf.h>
 #include <sys/ioctl.h>
 #include <sys/intr.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/proc.h>
 #include <sys/atomic.h>
 #include <sys/callout.h>
 @@ -491,26 +491,28 @@ pq3etsec_attach(device_t parent, device_
 	    &sc->sc_bsh);
 	if (error) {
 		aprint_error(": error mapping registers: %d\n", error);
 		return;
+	}
 	/*
 	 * Assume firmware has aready set the mac address and fetch it
 	 * before we reinit it.
 	 */
 	sc->sc_macstnaddr2 = etsec_read(sc, MACSTNADDR2);
 	sc->sc_macstnaddr1 = etsec_read(sc, MACSTNADDR1);
 	sc->sc_rctrl = RCTRL_DEFAULT;
 	sc->sc_ecntrl = etsec_read(sc, ECNTRL);
 	sc->sc_maccfg1 = etsec_read(sc, MACCFG1);
 	sc->sc_maccfg2 = MACCFG2_DEFAULT;
 	if (sc->sc_macstnaddr1 == 0 && sc->sc_macstnaddr2 == 0) {
 		size_t len;
 		const uint8_t *mac_addr =
 		    board_info_get_data("tsec-mac-addr-base", &len);
 		KASSERT(len == ETHER_ADDR_LEN);
 		sc->sc_macstnaddr2 =
 		    (mac_addr[1] << 24)
 		    | (mac_addr[0] << 16);
 		sc->sc_macstnaddr1 =
 		    ((mac_addr[5] + cnl->cnl_instance - 1) << 24)
 		    | (mac_addr[4] << 16)
 @@ -582,29 +584,26 @@ pq3etsec_attach(device_t parent, device_
+	}
 	sc->sc_soft_ih = softint_establish(SOFTINT_NET|SOFTINT_MPSAFE,
 	    pq3etsec_soft_intr, sc);
 	if (sc->sc_soft_ih == NULL) {
 		aprint_error(": failed to establish soft interrupt\n");
 		return;
+	}
 	aprint_normal("\n");
 	etsec_write(sc, ATTR, ATTR_DEFAULT);
 	etsec_write(sc, ATTRELI, ATTRELI_DEFAULT);
 	sc->sc_maccfg1 = etsec_read(sc, MACCFG1);
 	sc->sc_maccfg2 = etsec_read(sc, MACCFG2);
 	sc->sc_ecntrl = etsec_read(sc, ECNTRL);
 	sc->sc_lock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_SOFTNET);
 	callout_init(&sc->sc_mii_callout, CALLOUT_MPSAFE);
 	callout_setfunc(&sc->sc_mii_callout, pq3etsec_mii_tick, sc);
 	aprint_normal_dev(sc->sc_dev, "Ethernet address %s\n",
 	   ether_sprintf(enaddr));
 	const char * const xname = device_xname(sc->sc_dev);
 	struct ethercom * const ec = &sc->sc_ec;
 	struct ifnet * const ifp = &ec->ec_if;