diff options
| author | Malli Chilakala <mallikarjuna.chilakala@intel.com> | 2005-04-28 19:43:28 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-12 20:48:54 -0400 |
| commit | f0d11ed0b0650d2f93f56f65167c10a577c16c88 (patch) | |
| tree | 323348d8a7a272ea33be40168cee46c0f1bc13a8 /drivers/net/e1000 | |
| parent | f1d2e4905eed4b13c3ba56ac6d30c283be996963 (diff) | |
| download | op-kernel-dev-f0d11ed0b0650d2f93f56f65167c10a577c16c88.zip op-kernel-dev-f0d11ed0b0650d2f93f56f65167c10a577c16c88.tar.gz | |
[PATCH] e1000: Modified e1000_clean: exit poll
Modified e1000_clean:: exit poll if no Tx and work_done == 0
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c
Diffstat (limited to 'drivers/net/e1000')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 0fec670..4cdf371 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -2368,9 +2368,8 @@ e1000_clean(struct net_device *netdev, int *budget) *budget -= work_done; netdev->quota -= work_done; - /* if no Tx and not enough Rx work done, exit the polling mode */ - if((!tx_cleaned && (work_done < work_to_do)) || - !netif_running(netdev)) { + /* If no Tx and no Rx work done, exit the polling mode */ + if ((!tx_cleaned && (work_done == 0)) || !netif_running(netdev)) { netif_rx_complete(netdev); e1000_irq_enable(adapter); return 0; |
