From c7387f94e5e1a4aaf31c33426eac2d8c11423267 Mon Sep 17 00:00:00 2001 From: Malli Chilakala Date: Thu, 28 Apr 2005 19:43:28 -0700 Subject: [PATCH] --- yaml --- r: 1369 b: refs/heads/master c: f0d11ed0b0650d2f93f56f65167c10a577c16c88 h: refs/heads/master i: 1367: fc254a0663947d16ca518fd3503be4f55dac04e3 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_main.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3fb120f0008a..7f2a42f37f2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1d2e4905eed4b13c3ba56ac6d30c283be996963 +refs/heads/master: f0d11ed0b0650d2f93f56f65167c10a577c16c88 diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index 0fec670e51ef..4cdf371961eb 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/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;