aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAuke Kok <auke-jan.h.kok@intel.com>2006-05-26 12:35:47 -0400
committerAuke Kok <juke-jan.h.kok@intel.com>2006-05-26 12:35:47 -0400
commit3352a3b20ce880b17f185ad55bf27751f1c8edb9 (patch)
tree48b968af4adf8fd1bea134c64f888b53c8fe8436
parent3f3dc0dd2086402b684545d66bb5ece93c76330b (diff)
ixgb: remove lock access in the fast path
This mimics a change made in the e1000 driver that imitates a slick tg3 way of avoiding grabbing the lock around restarting the tx queue. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
-rw-r--r--drivers/net/ixgb/ixgb_main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index b8258509f9f9..a714c4d2d84b 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -1800,13 +1800,13 @@ ixgb_clean_tx_irq(struct ixgb_adapter *adapter)
1800 1800
1801 tx_ring->next_to_clean = i; 1801 tx_ring->next_to_clean = i;
1802 1802
1803 spin_lock(&adapter->tx_lock); 1803 if (unlikely(netif_queue_stopped(netdev))) {
1804 if(cleaned && netif_queue_stopped(netdev) && netif_carrier_ok(netdev) && 1804 spin_lock(&adapter->tx_lock);
1805 (IXGB_DESC_UNUSED(tx_ring) > IXGB_TX_QUEUE_WAKE)) { 1805 if (netif_queue_stopped(netdev) && netif_carrier_ok(netdev) &&
1806 1806 (IXGB_DESC_UNUSED(tx_ring) > IXGB_TX_QUEUE_WAKE))
1807 netif_wake_queue(netdev); 1807 netif_wake_queue(netdev);
1808 spin_unlock(&adapter->tx_lock);
1808 } 1809 }
1809 spin_unlock(&adapter->tx_lock);
1810 1810
1811 if(adapter->detect_tx_hung) { 1811 if(adapter->detect_tx_hung) {
1812 /* detect a transmit hang in hardware, this serializes the 1812 /* detect a transmit hang in hardware, this serializes the