diff options
author | Auke Kok <auke\-jan.h.kok@intel.com> | 2006-08-31 17:27:51 -0400 |
---|---|---|
committer | Auke Kok <juke-jan.h.kok@intel.com> | 2006-08-31 17:27:51 -0400 |
commit | ab8ced2fb00f3a1e1b63f8c3c61ad4262308ddc0 (patch) | |
tree | 8a0c6e990588885917675197e9b6166748d72160 | |
parent | a91bb6a8b411bdd8053601d7c2254d54670a4df6 (diff) |
ixgb: recalculate after how many descriptors to wake the queue
Recalculate when to wake the queue using DESC_NEEDED instead of a
static hardcoded number.
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
-rw-r--r-- | drivers/net/ixgb/ixgb.h | 3 | ||||
-rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h index 82b67af54c94..a4bee8cafa58 100644 --- a/drivers/net/ixgb/ixgb.h +++ b/drivers/net/ixgb/ixgb.h | |||
@@ -110,9 +110,6 @@ struct ixgb_adapter; | |||
110 | #define IXGB_RXBUFFER_8192 8192 | 110 | #define IXGB_RXBUFFER_8192 8192 |
111 | #define IXGB_RXBUFFER_16384 16384 | 111 | #define IXGB_RXBUFFER_16384 16384 |
112 | 112 | ||
113 | /* How many Tx Descriptors do we need to call netif_wake_queue? */ | ||
114 | #define IXGB_TX_QUEUE_WAKE 16 | ||
115 | |||
116 | /* How many Rx Buffers do we bundle into one write to the hardware ? */ | 113 | /* How many Rx Buffers do we bundle into one write to the hardware ? */ |
117 | #define IXGB_RX_BUFFER_WRITE 4 /* Must be power of 2 */ | 114 | #define IXGB_RX_BUFFER_WRITE 4 /* Must be power of 2 */ |
118 | 115 | ||
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index fee4c5aac31b..960b44b5b02b 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c | |||
@@ -1787,7 +1787,7 @@ ixgb_clean_tx_irq(struct ixgb_adapter *adapter) | |||
1787 | if (unlikely(netif_queue_stopped(netdev))) { | 1787 | if (unlikely(netif_queue_stopped(netdev))) { |
1788 | spin_lock(&adapter->tx_lock); | 1788 | spin_lock(&adapter->tx_lock); |
1789 | if (netif_queue_stopped(netdev) && netif_carrier_ok(netdev) && | 1789 | if (netif_queue_stopped(netdev) && netif_carrier_ok(netdev) && |
1790 | (IXGB_DESC_UNUSED(tx_ring) > IXGB_TX_QUEUE_WAKE)) | 1790 | (IXGB_DESC_UNUSED(tx_ring) >= DESC_NEEDED)) |
1791 | netif_wake_queue(netdev); | 1791 | netif_wake_queue(netdev); |
1792 | spin_unlock(&adapter->tx_lock); | 1792 | spin_unlock(&adapter->tx_lock); |
1793 | } | 1793 | } |