diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-17 15:49:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-17 15:49:59 -0800 |
| commit | 30472908d50cf726a68c2b444127a1dafae8a91c (patch) | |
| tree | 6277cdad2fe6949b9c7aa160e1de435fe367f18e /drivers/net/e1000e/netdev.c | |
| parent | abde3dff2496d9d44a218cf8e2a17c2383f20b22 (diff) | |
| parent | e415e6ea0cd36ece29c7b12232286b5ca097ac96 (diff) | |
| download | kernel_samsung_crespo-30472908d50cf726a68c2b444127a1dafae8a91c.zip kernel_samsung_crespo-30472908d50cf726a68c2b444127a1dafae8a91c.tar.gz kernel_samsung_crespo-30472908d50cf726a68c2b444127a1dafae8a91c.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
[NIU]: Fix 1G PHY link state handling.
[NET]: Fix TX timeout regression in Intel drivers.
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 4a6fc74..2ab3bfb 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -1384,7 +1384,7 @@ static int e1000_clean(struct napi_struct *napi, int budget) { struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi); struct net_device *poll_dev = adapter->netdev; - int work_done = 0; + int tx_cleaned = 0, work_done = 0; /* Must NOT use netdev_priv macro here. */ adapter = poll_dev->priv; @@ -1394,12 +1394,15 @@ static int e1000_clean(struct napi_struct *napi, int budget) * simultaneously. A failure obtaining the lock means * tx_ring is currently being cleaned anyway. */ if (spin_trylock(&adapter->tx_queue_lock)) { - e1000_clean_tx_irq(adapter); + tx_cleaned = e1000_clean_tx_irq(adapter); spin_unlock(&adapter->tx_queue_lock); } adapter->clean_rx(adapter, &work_done, budget); + if (tx_cleaned) + work_done = budget; + /* If budget not fully consumed, exit the polling mode */ if (work_done < budget) { if (adapter->itr_setting & 3) |