ixgb: maybe stop tx port missed a piece (0f8ecbad) · Commits · 戴 / test

back when maybe stop tx was added to the ixgb driver some mistakes were made and the driver a) didn't remove the tx lock, which is now un-necessary b) didn't change the restart code to be compliant with maybe_stop Signed-off-by:

Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by:

Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by:

Jeff Garzik <jgarzik@redhat.com>

drivers/net/ixgb/ixgb_main.c

+10 −5

Original line number	Diff line number	Diff line
		@@ -1855,12 +1855,17 @@ ixgb_clean_tx_irq(struct ixgb_adapter *adapter)

		tx_ring->next_to_clean = i;

		if (unlikely(netif_queue_stopped(netdev))) {
		spin_lock(&adapter->tx_lock);
		if (netif_queue_stopped(netdev) && netif_carrier_ok(netdev) &&
		(IXGB_DESC_UNUSED(tx_ring) >= DESC_NEEDED))
		if (unlikely(cleaned && netif_carrier_ok(netdev) &&
		IXGB_DESC_UNUSED(tx_ring) >= DESC_NEEDED)) {
		/* Make sure that anybody stopping the queue after this
		* sees the new next_to_clean. */
		smp_mb();

		if (netif_queue_stopped(netdev) &&
		!(test_bit(__IXGB_DOWN, &adapter->flags))) {
		netif_wake_queue(netdev);
		spin_unlock(&adapter->tx_lock);
		++adapter->restart_queue;
		}
		}

		if(adapter->detect_tx_hung) {

Admin message