netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [resend][PATCH net-drivers-2.4 12/16] e1000: Modified e1000_clean:: exit poll
@ 2005-04-29  3:15 Malli Chilakala
  2005-08-19  6:22 ` Jeff Garzik
  0 siblings, 1 reply; 2+ messages in thread
From: Malli Chilakala @ 2005-04-29  3:15 UTC (permalink / raw)
  To: netdev; +Cc: jgarzik@pobox.com

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.4/drivers/net/e1000/e1000_main.c net-drivers-2.4/drivers/net/e1000.new/e1000_main.c
--- net-drivers-2.4/drivers/net/e1000/e1000_main.c	2005-04-12 23:00:53.000000000 -0700
+++ net-drivers-2.4/drivers/net/e1000.new/e1000_main.c	2005-04-12 23:00:55.000000000 -0700
@@ -2325,9 +2325,8 @@ e1000_clean(struct net_device *netdev, i
 	*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;

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [resend][PATCH net-drivers-2.4 12/16] e1000: Modified e1000_clean:: exit poll
  2005-04-29  3:15 [resend][PATCH net-drivers-2.4 12/16] e1000: Modified e1000_clean:: exit poll Malli Chilakala
@ 2005-08-19  6:22 ` Jeff Garzik
  0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2005-08-19  6:22 UTC (permalink / raw)
  To: Malli Chilakala; +Cc: netdev

Malli Chilakala wrote:
> 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>

Applied e1000 patches 1-12 to 2.4.x.  Stopped at this patch.

Patch 13 was corrupted, so that's where the import stopped.

But nonetheless... 2.4.x netdev patches are flowing again!

	Jeff

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2005-08-19  6:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-04-29  3:15 [resend][PATCH net-drivers-2.4 12/16] e1000: Modified e1000_clean:: exit poll Malli Chilakala
2005-08-19  6:22 ` Jeff Garzik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).