Re: [PATCH] [-MM, FIX V3] e1000e: incorporate napi_struct changes from net-2.6.24.git

Kok, Auke writes:

david,

 > 
 > while testing this patch I noticed that the poll routine is now called 
 > 100% of the time, and since I'm not doing much different than before, I 
 > suspec that something in the new napi code is staying in polling mode 
 > forever? Since e1000e is pretty much the same code as e1000, I doubt the 
 > problem is there, but you can probably tell better. ideas?

 Hello,
 
 Yes a correct observation. I've spotted this bug too and it caused by the 
 policy change in the NAPI scheduling. Look at tx_cleaned. 


 I suggest we revert this change for now.
 

 Cheers
					--ro


Signed-off-by: Robert Olsson <redacted>


 diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 7b0bcdb..5cb883a 100644

--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c

@@ -3944,7 +3944,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))