From 9c621299b3521c9f2c333e0a2de65a86c2c14f05 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Thu, 31 Aug 2006 14:27:51 -0700 Subject: [PATCH] --- yaml --- r: 35215 b: refs/heads/master c: ab8ced2fb00f3a1e1b63f8c3c61ad4262308ddc0 h: refs/heads/master i: 35213: 35aa759b185d1e294a543ae98df3684321856c96 35211: 69698b82b870870dc530ee1d5cc0471879484aaa 35207: 15d92cac2e989f31c97512c825a5606ec8ff7ae0 35199: 7fb7c655bd2a70237e0cc4868fbf4d57819ac1a6 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgb/ixgb.h | 3 --- trunk/drivers/net/ixgb/ixgb_main.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7478f48e1f78..f97e1b5f30f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a91bb6a8b411bdd8053601d7c2254d54670a4df6 +refs/heads/master: ab8ced2fb00f3a1e1b63f8c3c61ad4262308ddc0 diff --git a/trunk/drivers/net/ixgb/ixgb.h b/trunk/drivers/net/ixgb/ixgb.h index 82b67af54c94..a4bee8cafa58 100644 --- a/trunk/drivers/net/ixgb/ixgb.h +++ b/trunk/drivers/net/ixgb/ixgb.h @@ -110,9 +110,6 @@ struct ixgb_adapter; #define IXGB_RXBUFFER_8192 8192 #define IXGB_RXBUFFER_16384 16384 -/* How many Tx Descriptors do we need to call netif_wake_queue? */ -#define IXGB_TX_QUEUE_WAKE 16 - /* How many Rx Buffers do we bundle into one write to the hardware ? */ #define IXGB_RX_BUFFER_WRITE 4 /* Must be power of 2 */ diff --git a/trunk/drivers/net/ixgb/ixgb_main.c b/trunk/drivers/net/ixgb/ixgb_main.c index fee4c5aac31b..960b44b5b02b 100644 --- a/trunk/drivers/net/ixgb/ixgb_main.c +++ b/trunk/drivers/net/ixgb/ixgb_main.c @@ -1787,7 +1787,7 @@ ixgb_clean_tx_irq(struct ixgb_adapter *adapter) 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) > IXGB_TX_QUEUE_WAKE)) + (IXGB_DESC_UNUSED(tx_ring) >= DESC_NEEDED)) netif_wake_queue(netdev); spin_unlock(&adapter->tx_lock); }