 @@ -49,27 +49,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * 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.
  */
 /*$FreeBSD: head/sys/dev/ixgbe/ix_txrx.c 301538 2016-06-07 04:51:50Z sephe $*/
-/*$NetBSD: ix_txrx.c,v 1.26 2017/06/13 09:35:12 msaitoh Exp $*/
+/*$NetBSD: ix_txrx.c,v 1.27 2017/06/13 09:37:22 msaitoh Exp $*/
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "ixgbe.h"
 #ifdef DEV_NETMAP
 #include <net/netmap.h>
 #include <sys/selinfo.h>
 #include <dev/netmap/netmap_kern.h>
 extern int ix_crcstrip;
 #endif
 @@ -1436,41 +1436,30 @@ ixgbe_allocate_receive_buffers(struct rx
+		}
+	}
 	return (0);
 fail:
 	/* Frees all, but can handle partial completion */
 	ixgbe_free_receive_structures(adapter);
 	return (error);
+}
 static void
 ixgbe_free_receive_ring(struct rx_ring *rxr)
+{
 	struct ixgbe_rx_buf       *rxbuf;
 	for (int i = 0; i < rxr->num_desc; i++) {
-		rxbuf = &rxr->rx_buffers[i];
+		ixgbe_rx_discard(rxr, i);
 		if (rxbuf->buf != NULL) {
 			bus_dmamap_sync(rxr->ptag->dt_dmat, rxbuf->pmap,
 , rxbuf->buf->m_pkthdr.len,
 			    BUS_DMASYNC_POSTREAD);
 			ixgbe_dmamap_unload(rxr->ptag, rxbuf->pmap);
 			rxbuf->buf->m_flags |= M_PKTHDR;
 			m_freem(rxbuf->buf);
 			rxbuf->buf = NULL;
 			rxbuf->flags = 0;
+	}
+}
 /*********************************************************************
+ *
  *  Initialize a receive ring and its buffers.
+ *
  **********************************************************************/
 static int
 ixgbe_setup_receive_ring(struct rx_ring *rxr)
+{
 	struct	adapter 	*adapter;
 	struct ixgbe_rx_buf	*rxbuf;
 @@ -1622,27 +1611,29 @@ ixgbe_setup_receive_structures(struct ad
 	for (j = 0; j < adapter->num_queues; j++, rxr++)
 		if (ixgbe_setup_receive_ring(rxr))
 			goto fail;
 	return (0);
 fail:
 	/*
 	 * Free RX buffers allocated so far, we will only handle
 	 * the rings that completed, the failing case will have
 	 * cleaned up for itself. 'j' failed, so its the terminus.
 	 */
 	for (int i = 0; i < j; ++i) {
 		rxr = &adapter->rx_rings[i];
 		IXGBE_RX_LOCK(rxr);
 		ixgbe_free_receive_ring(rxr);
 		IXGBE_RX_UNLOCK(rxr);
+	}
 	return (ENOBUFS);
+}
 /*********************************************************************
+ *
  *  Free all receive rings.
+ *
  **********************************************************************/
 void
 ixgbe_free_receive_structures(struct adapter *adapter)
 @@ -1676,35 +1667,27 @@ ixgbe_free_receive_structures(struct ada
  **********************************************************************/
 static void
 ixgbe_free_receive_buffers(struct rx_ring *rxr)
+{
 	struct adapter		*adapter = rxr->adapter;
 	struct ixgbe_rx_buf	*rxbuf;
 	INIT_DEBUGOUT("ixgbe_free_receive_buffers: begin");
 	/* Cleanup any existing buffers */
 	if (rxr->rx_buffers != NULL) {
 		for (int i = 0; i < adapter->num_rx_desc; i++) {
 			rxbuf = &rxr->rx_buffers[i];
-			if (rxbuf->buf != NULL) {
+			ixgbe_rx_discard(rxr, i);
 				bus_dmamap_sync(rxr->ptag->dt_dmat,
 				    rxbuf->pmap, 0, rxbuf->buf->m_pkthdr.len,
 				    BUS_DMASYNC_POSTREAD);
 				ixgbe_dmamap_unload(rxr->ptag, rxbuf->pmap);
 				rxbuf->buf->m_flags |= M_PKTHDR;
 				m_freem(rxbuf->buf);
 			rxbuf->buf = NULL;
 			if (rxbuf->pmap != NULL) {
 				ixgbe_dmamap_destroy(rxr->ptag, rxbuf->pmap);
 				rxbuf->pmap = NULL;
+			}
+		}
 		if (rxr->rx_buffers != NULL) {
 			free(rxr->rx_buffers, M_DEVBUF);
 			rxr->rx_buffers = NULL;
+		}
+	}
 	if (rxr->ptag != NULL) {
 		ixgbe_dma_tag_destroy(rxr->ptag);
 @@ -1762,31 +1745,34 @@ ixgbe_rx_discard(struct rx_ring *rxr, in
 	rbuf = &rxr->rx_buffers[i];
 	/*
 	** With advanced descriptors the writeback
 	** clobbers the buffer addrs, so its easier
 	** to just free the existing mbufs and take
 	** the normal refresh path to get new buffers
 	** and mapping.
 	*/
 	if (rbuf->fmp != NULL) {/* Partial chain ? */
-		rbuf->fmp->m_flags |= M_PKTHDR;
+		bus_dmamap_sync(rxr->ptag->dt_dmat, rbuf->pmap, 0,
 		    rbuf->buf->m_pkthdr.len, BUS_DMASYNC_POSTREAD);
 		m_freem(rbuf->fmp);
 		rbuf->fmp = NULL;
 		rbuf->buf = NULL; /* rbuf->buf is part of fmp's chain */
 	} else if (rbuf->buf) {
 		bus_dmamap_sync(rxr->ptag->dt_dmat, rbuf->pmap, 0,
 		    rbuf->buf->m_pkthdr.len, BUS_DMASYNC_POSTREAD);
 		m_free(rbuf->buf);
 		rbuf->buf = NULL;
+	}
 	ixgbe_dmamap_unload(rxr->ptag, rbuf->pmap);
 	rbuf->flags = 0;
 	return;
+}
 /*********************************************************************
+ *
 @@ -1860,26 +1846,29 @@ ixgbe_rxeof(struct ix_queue *que)
 		eop = ((staterr & IXGBE_RXD_STAT_EOP) != 0);
 		/* Make sure bad packets are discarded */
 		if (eop && (staterr & IXGBE_RXDADV_ERR_FRAME_ERR_MASK) != 0) {
 #if __FreeBSD_version >= 1100036
 			if (IXGBE_IS_VF(adapter))
 				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 #endif
 			rxr->rx_discarded.ev_count++;
 			ixgbe_rx_discard(rxr, i);
 			goto next_desc;
+		}
 		bus_dmamap_sync(rxr->ptag->dt_dmat, rbuf->pmap, 0,
 		    rbuf->buf->m_pkthdr.len, BUS_DMASYNC_POSTREAD);
 		/*
 		** On 82599 which supports a hardware
 		** LRO (called HW RSC), packets need
 		** not be fragmented across sequential
 		** descriptors, rather the next descriptor
 		** is indicated in bits of the descriptor.
 		** This also means that we might proceses
 		** more than one packet at a time, something
 		** that has never been true before, it
 		** required eliminating global chain pointers
 		** in favor of what we are doing here.  -jfv
 		*/
 		if (!eop) {