 @@ -1,14 +1,14 @@
-/*	$NetBSD: atw.c,v 1.142 2008/12/16 22:35:30 christos Exp $  */
+/*	$NetBSD: atw.c,v 1.143 2009/05/26 23:57:34 dyoung Exp $  */
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by David Young, by Jason R. Thorpe, and by Charles M. Hannum.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * 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.
  */
 /*
  * Device driver for the ADMtek ADM8211 802.11 MAC/BBP.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.142 2008/12/16 22:35:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.143 2009/05/26 23:57:34 dyoung Exp $");
 #include "bpfilter.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 @@ -564,77 +564,82 @@ atw_attach(struct atw_softc *sc)
 	SIMPLEQ_INIT(&sc->sc_txdirtyq);
 #ifdef ATW_DEBUG
 	atw_print_regs(sc, "atw_attach");
 #endif /* ATW_DEBUG */
 	/*
 	 * Allocate the control data structures, and create and load the
 	 * DMA map for it.
 	 */
 	if ((error = bus_dmamem_alloc(sc->sc_dmat,
 	    sizeof(struct atw_control_data), PAGE_SIZE, 0, &sc->sc_cdseg,
 , &sc->sc_cdnseg, 0)) != 0) {
-		aprint_error_dev(sc->sc_dev, "unable to allocate control data, error = %d\n",
+		aprint_error_dev(sc->sc_dev,
 		    "unable to allocate control data, error = %d\n",
 		    error);
 		goto fail_0;
+	}
 	if ((error = bus_dmamem_map(sc->sc_dmat, &sc->sc_cdseg, sc->sc_cdnseg,
 	    sizeof(struct atw_control_data), (void **)&sc->sc_control_data,
 	    BUS_DMA_COHERENT)) != 0) {
-		aprint_error_dev(sc->sc_dev, "unable to map control data, error = %d\n",
+		aprint_error_dev(sc->sc_dev,
 		    "unable to map control data, error = %d\n",
 		    error);
 		goto fail_1;
+	}
 	if ((error = bus_dmamap_create(sc->sc_dmat,
 	    sizeof(struct atw_control_data), 1,
 	    sizeof(struct atw_control_data), 0, 0, &sc->sc_cddmamap)) != 0) {
-		aprint_error_dev(sc->sc_dev, "unable to create control data DMA map, "
+		aprint_error_dev(sc->sc_dev,
-		    "error = %d\n", error);
+		    "unable to create control data DMA map, error = %d\n",
 		    error);
 		goto fail_2;
+	}
 	if ((error = bus_dmamap_load(sc->sc_dmat, sc->sc_cddmamap,
 	    sc->sc_control_data, sizeof(struct atw_control_data), NULL,
 )) != 0) {
-		aprint_error_dev(sc->sc_dev, "unable to load control data DMA map, error = %d\n",
+		aprint_error_dev(sc->sc_dev,
-		    error);
+		    "unable to load control data DMA map, error = %d\n", error);
 		goto fail_3;
+	}
 	/*
 	 * Create the transmit buffer DMA maps.
 	 */
 	sc->sc_ntxsegs = ATW_NTXSEGS;
 	for (i = 0; i < ATW_TXQUEUELEN; i++) {
 		if ((error = bus_dmamap_create(sc->sc_dmat, MCLBYTES,
 		    sc->sc_ntxsegs, MCLBYTES, 0, 0,
 		    &sc->sc_txsoft[i].txs_dmamap)) != 0) {
-			aprint_error_dev(sc->sc_dev, "unable to create tx DMA map %d, "
+			aprint_error_dev(sc->sc_dev,
-			    "error = %d\n", i, error);
+			    "unable to create tx DMA map %d, error = %d\n", i,
 			    error);
 			goto fail_4;
+		}
+	}
 	/*
 	 * Create the receive buffer DMA maps.
 	 */
 	for (i = 0; i < ATW_NRXDESC; i++) {
 		if ((error = bus_dmamap_create(sc->sc_dmat, MCLBYTES, 1,
 		    MCLBYTES, 0, 0, &sc->sc_rxsoft[i].rxs_dmamap)) != 0) {
-			aprint_error_dev(sc->sc_dev, "unable to create rx DMA map %d, "
+			aprint_error_dev(sc->sc_dev,
-			    "error = %d\n", i, error);
+			    "unable to create rx DMA map %d, error = %d\n", i,
 			    error);
 			goto fail_5;
+		}
+	}
 	for (i = 0; i < ATW_NRXDESC; i++) {
 		sc->sc_rxsoft[i].rxs_mbuf = NULL;
+	}
 	switch (sc->sc_rev) {
 	case ATW_REVISION_AB:
 	case ATW_REVISION_AF:
 		sc->sc_sramlen = ATW_SRAM_A_SIZE;
 		break;
 	case ATW_REVISION_BA: