From 94e82028f4c9e58fa642c1cb0b342bcd0ba9b181 Mon Sep 17 00:00:00 2001
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 2 Mar 2006 18:20:43 -0800
Subject: [PATCH] --- yaml --- r: 21255 b: refs/heads/master c:
 2a1af5d7dfd809b16fb69f3f0fc073d9b6b7c6ac h: refs/heads/master i:   21253:
 df4bde79870710cac4eb515e02ffba01b575f458   21251:
 c6ed6668b5661e30787eae430911fe3d60ed4d74   21247:
 08586e62ce30ff78bf1cd5eb08ac0491acbfc258 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/e1000/e1000_main.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f8093ffed73e..6d3964cc0a7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85b22eb632dc75887ba99edad49307a02c2ae7ec
+refs/heads/master: 2a1af5d7dfd809b16fb69f3f0fc073d9b6b7c6ac
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
index 58561a4955e3..e80378a220d4 100644
--- a/trunk/drivers/net/e1000/e1000_main.c
+++ b/trunk/drivers/net/e1000/e1000_main.c
@@ -3349,6 +3349,9 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,
 	struct e1000_tx_desc *tx_desc, *eop_desc;
 	struct e1000_buffer *buffer_info;
 	unsigned int i, eop;
+#ifdef CONFIG_E1000_NAPI
+	unsigned int count = 0;
+#endif
 	boolean_t cleaned = FALSE;
 
 	i = tx_ring->next_to_clean;
@@ -3370,6 +3373,11 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,
 
 		eop = tx_ring->buffer_info[i].next_to_watch;
 		eop_desc = E1000_TX_DESC(*tx_ring, eop);
+#ifdef CONFIG_E1000_NAPI
+#define E1000_TX_WEIGHT 64
+		/* weight of a sort for tx, to avoid endless transmit cleanup */
+		if (count++ == E1000_TX_WEIGHT) break;
+#endif
 	}
 
 	tx_ring->next_to_clean = i;