From: Auke Kok <auke-jan.h.kok@intel.com>
Date: Wed, 28 Nov 2007 00:26:36 +0000 (-0800)
Subject: e1000: Fix NAPI state bug when Rx complete
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=f7bbb9098315d712351aba7861a8c9fcf6bf0213;hp=e970d1f8106514ea619d7a9005b1dc92c6049b32;p=powerpc.git

e1000: Fix NAPI state bug when Rx complete

Don't exit polling when we have not yet used our budget, this causes
the NAPI system to end up with a messed up poll list.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index cf39473ef9..4f37506ad3 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3942,7 +3942,7 @@ e1000_clean(struct napi_struct *napi, int budget)
 	                  &work_done, budget);
 
 	/* If no Tx and not enough Rx work done, exit the polling mode */
-	if ((!tx_cleaned && (work_done < budget)) ||
+	if ((!tx_cleaned && (work_done == 0)) ||
 	   !netif_running(poll_dev)) {
 quit_polling:
 		if (likely(adapter->itr_setting & 3))