Module Name: src Committed By: msaitoh Date: Wed Nov 30 05:30:28 UTC 2016
Modified Files: src/sys/dev/pci/ixgbe: ix_txrx.c Log Message: Extra "buf->map = NULL;"s in ixgbe_txeof() were removed in FreeBSD r282299. This was fixed in NetBSD's ixgbe.c rev. 1.28. Remove our comment. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/ixgbe/ix_txrx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/pci/ixgbe/ix_txrx.c diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.1 src/sys/dev/pci/ixgbe/ix_txrx.c:1.2 --- src/sys/dev/pci/ixgbe/ix_txrx.c:1.1 Mon Nov 28 02:23:33 2016 +++ src/sys/dev/pci/ixgbe/ix_txrx.c Wed Nov 30 05:30:28 2016 @@ -59,7 +59,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ /*$FreeBSD: head/sys/dev/ixgbe/ixgbe.c 279805 2015-03-09 10:29:15Z araujo $*/ -/*$NetBSD: ix_txrx.c,v 1.1 2016/11/28 02:23:33 msaitoh Exp $*/ +/*$NetBSD: ix_txrx.c,v 1.2 2016/11/30 05:30:28 msaitoh Exp $*/ #include "ixgbe.h" @@ -1017,10 +1017,6 @@ ixgbe_txeof(struct tx_ring *txr) buf->map); m_freem(buf->m_head); buf->m_head = NULL; - /* - * NetBSD: Don't override buf->map with NULL here. - * It'll panic when a ring runs one lap around. - */ } buf->eop = NULL; ++txr->tx_avail; @@ -1047,11 +1043,6 @@ ixgbe_txeof(struct tx_ring *txr) buf->map); m_freem(buf->m_head); buf->m_head = NULL; - /* - * NetBSD: Don't override buf->map with NULL - * here. It'll panic when a ring runs one lap - * around. - */ } ++txr->tx_avail; buf->eop = NULL;