Module Name: src Committed By: msaitoh Date: Wed Feb 4 04:37:13 UTC 2015
Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c Log Message: Remove extra IXGBE_TX_LOCK()/IXGBE_TX_UNLOCK() from ixgbe_free_transmit_structures(). This function is called in the end of the detach function. if_stop was called and almost all resources were freed, so it's not required to block the TX stuff. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/ixgbe/ixgbe.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/ixgbe.c diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.16 src/sys/dev/pci/ixgbe/ixgbe.c:1.17 --- src/sys/dev/pci/ixgbe/ixgbe.c:1.16 Wed Feb 4 03:17:29 2015 +++ src/sys/dev/pci/ixgbe/ixgbe.c Wed Feb 4 04:37:13 2015 @@ -59,7 +59,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ /*$FreeBSD: src/sys/dev/ixgbe/ixgbe.c,v 1.51 2011/04/25 23:34:21 jfv Exp $*/ -/*$NetBSD: ixgbe.c,v 1.16 2015/02/04 03:17:29 msaitoh Exp $*/ +/*$NetBSD: ixgbe.c,v 1.17 2015/02/04 04:37:13 msaitoh Exp $*/ #include "opt_inet.h" @@ -3180,10 +3180,8 @@ ixgbe_free_transmit_structures(struct ad struct tx_ring *txr = adapter->tx_rings; for (int i = 0; i < adapter->num_queues; i++, txr++) { - IXGBE_TX_LOCK(txr); ixgbe_free_transmit_buffers(txr); ixgbe_dma_free(adapter, &txr->txdma); - IXGBE_TX_UNLOCK(txr); IXGBE_TX_LOCK_DESTROY(txr); } free(adapter->tx_rings, M_DEVBUF);