 @@ -1,14 +1,14 @@
-/* $NetBSD: i82596.c,v 1.29 2010/04/05 07:19:35 joerg Exp $ */
+/* $NetBSD: i82596.c,v 1.29.20.1 2017/08/18 15:02:11 snj Exp $ */
 /*
  * Copyright (c) 2003 Jochen Kunz.
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -33,27 +33,27 @@
  * Driver for the Intel i82596CA and i82596DX/SX 10MBit/s Ethernet chips.
+ *
  * It operates the i82596 in 32-Bit Linear Mode, opposed to the old i82586
  * ie(4) driver (src/sys/dev/ic/i82586.c), that degrades the i82596 to
  * i82586 compatibility mode.
+ *
  * Documentation about these chips can be found at
+ *
  *	http://developer.intel.com/design/network/datashts/290218.htm
  *	http://developer.intel.com/design/network/datashts/290219.htm
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82596.c,v 1.29 2010/04/05 07:19:35 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82596.c,v 1.29.20.1 2017/08/18 15:02:11 snj Exp $");
 /* autoconfig and device stuff */
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include "locators.h"
 #include "ioconf.h"
 /* bus_space / bus_dma etc. */
 #include <sys/bus.h>
 #include <sys/intr.h>
 /* general system data and functions */
 @@ -744,50 +744,53 @@ iee_start(struct ifnet *ifp)
 		if (bus_dmamap_load_mbuf(sc->sc_dmat, sc->sc_tx_map[t],
 		    sc->sc_tx_mbuf[t], BUS_DMA_WRITE | BUS_DMA_NOWAIT) != 0) {
 			/*
 			 * The packet needs more TBD then we support.
 			 * Copy the packet into a mbuf cluster to get it out.
 			 */
 			printf("%s: iee_start: failed to load DMA map\n",
 			    device_xname(sc->sc_dev));
 			MGETHDR(m, M_DONTWAIT, MT_DATA);
 			if (m == NULL) {
 				printf("%s: iee_start: can't allocate mbuf\n",
 				    device_xname(sc->sc_dev));
 				m_freem(sc->sc_tx_mbuf[t]);
 				sc->sc_tx_mbuf[t] = NULL;
 				t--;
 				continue;
+			}
 			MCLAIM(m, &sc->sc_ethercom.ec_rx_mowner);
 			MCLGET(m, M_DONTWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				printf("%s: iee_start: can't allocate mbuf "
 				    "cluster\n", device_xname(sc->sc_dev));
 				m_freem(sc->sc_tx_mbuf[t]);
 				sc->sc_tx_mbuf[t] = NULL;
 				m_freem(m);
 				t--;
 				continue;
+			}
 			m_copydata(sc->sc_tx_mbuf[t], 0,
 			    sc->sc_tx_mbuf[t]->m_pkthdr.len, mtod(m, void *));
 			m->m_pkthdr.len = sc->sc_tx_mbuf[t]->m_pkthdr.len;
 			m->m_len = sc->sc_tx_mbuf[t]->m_pkthdr.len;
 			m_freem(sc->sc_tx_mbuf[t]);
 			sc->sc_tx_mbuf[t] = m;
 			if (bus_dmamap_load_mbuf(sc->sc_dmat, sc->sc_tx_map[t],
 		    	    m, BUS_DMA_WRITE | BUS_DMA_NOWAIT) != 0) {
 				printf("%s: iee_start: can't load TX DMA map\n",
 				    device_xname(sc->sc_dev));
 				m_freem(sc->sc_tx_mbuf[t]);
 				sc->sc_tx_mbuf[t] = NULL;
 				t--;
 				continue;
+			}
+		}
 		for (n = 0 ; n < sc->sc_tx_map[t]->dm_nsegs ; n++) {
 			tbd = SC_TBD(sc, sc->sc_next_tbd + n);
 			tbd->tbd_tb_addr =
 			    IEE_SWAPA32(sc->sc_tx_map[t]->dm_segs[n].ds_addr);
 			tbd->tbd_size =
 			    sc->sc_tx_map[t]->dm_segs[n].ds_len;
 			tbd->tbd_link_addr =
 			    IEE_SWAPA32(IEE_PHYS_SHMEM(sc->sc_tbd_off +
 			    sc->sc_tbd_sz * (sc->sc_next_tbd + n + 1)));
 @@ -917,48 +920,51 @@ iee_init(struct ifnet *ifp)
 			MGETHDR(sc->sc_rx_mbuf[r], M_DONTWAIT, MT_DATA);
 			if (sc->sc_rx_mbuf[r] == NULL) {
 				printf("%s: iee_init: can't allocate mbuf\n",
 				    device_xname(sc->sc_dev));
 				err = 1;
 				break;
+			}
 			MCLAIM(sc->sc_rx_mbuf[r],&sc->sc_ethercom.ec_rx_mowner);
 			MCLGET(sc->sc_rx_mbuf[r], M_DONTWAIT);
 			if ((sc->sc_rx_mbuf[r]->m_flags & M_EXT) == 0) {
 				printf("%s: iee_init: can't allocate mbuf"
 				    " cluster\n", device_xname(sc->sc_dev));
 				m_freem(sc->sc_rx_mbuf[r]);
 				sc->sc_rx_mbuf[r] = NULL;
 				err = 1;
 				break;
+			}
 			sc->sc_rx_mbuf[r]->m_len =
 			    sc->sc_rx_mbuf[r]->m_pkthdr.len = MCLBYTES - 2;
 			sc->sc_rx_mbuf[r]->m_data += 2;
+		}
 		if (sc->sc_rx_map[r] == NULL && bus_dmamap_create(sc->sc_dmat,
 		    MCLBYTES, 1, MCLBYTES , 0, BUS_DMA_NOWAIT,
 		    &sc->sc_rx_map[r]) != 0) {
 				printf("%s: iee_init: can't create RX "
 				    "DMA map\n", device_xname(sc->sc_dev));
 				m_freem(sc->sc_rx_mbuf[r]);
 				sc->sc_rx_mbuf[r] = NULL;
 				err = 1;
 				break;
+			}
 		if (bus_dmamap_load_mbuf(sc->sc_dmat, sc->sc_rx_map[r],
 		    sc->sc_rx_mbuf[r], BUS_DMA_READ | BUS_DMA_NOWAIT) != 0) {
 			printf("%s: iee_init: can't load RX DMA map\n",
 			    device_xname(sc->sc_dev));
 			bus_dmamap_destroy(sc->sc_dmat, sc->sc_rx_map[r]);
 			m_freem(sc->sc_rx_mbuf[r]);
 			sc->sc_rx_mbuf[r] = NULL;
 			err = 1;
 			break;
+		}
 		bus_dmamap_sync(sc->sc_dmat, sc->sc_rx_map[r], 0,
 		    sc->sc_rx_map[r]->dm_mapsize, BUS_DMASYNC_PREREAD);
 		SC_RBD(sc, r)->rbd_size = sc->sc_rx_map[r]->dm_segs[0].ds_len;
 		SC_RBD(sc, r)->rbd_rb_addr =
 		    IEE_SWAPA32(sc->sc_rx_map[r]->dm_segs[0].ds_addr);
+	}
 	SC_RFD(sc, 0)->rfd_rbd_addr =
 	    IEE_SWAPA32(IEE_PHYS_SHMEM(sc->sc_rbd_off));
 	if (err != 0) {
 		for (n = 0 ; n < r; n++) {