From 6484ab22a9424ea0ddf8cc70b958e918631d30dd Mon Sep 17 00:00:00 2001 From: Jesse Brandeburg Date: Tue, 8 Jul 2008 15:51:07 -0700 Subject: [PATCH] --- yaml --- r: 103471 b: refs/heads/master c: 0f8ecbadae4bd9f085e605c08347ed3077a6146f h: refs/heads/master i: 103469: 892eeb2f5ce11f408d080a68155d53a3de1f8630 103467: 20b67b06da7e0f71f1c31c798a4783a97ce6c008 103463: 33f65d9c77aeaa4e4bb98f746152112330466c9b 103455: 1e1b1a0f9469f1a05285d396d24b7ff7d1b61885 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgb/ixgb_main.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ff42897f932b..daad41c0d717 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a342d224afb03196e3df28a271f3ddf3787e8f4 +refs/heads/master: 0f8ecbadae4bd9f085e605c08347ed3077a6146f diff --git a/trunk/drivers/net/ixgb/ixgb_main.c b/trunk/drivers/net/ixgb/ixgb_main.c index 41f3adf5f375..04cac41f7d5e 100644 --- a/trunk/drivers/net/ixgb/ixgb_main.c +++ b/trunk/drivers/net/ixgb/ixgb_main.c @@ -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) {