---

yaml
---
r: 21255
b: refs/heads/master
c: 2a1af5d
h: refs/heads/master
i:
  21253: df4bde7
  21251: c6ed666
  21247: 08586e6
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85b22eb632dc75887ba99edad49307a02c2ae7ec
+refs/heads/master: 2a1af5d7dfd809b16fb69f3f0fc073d9b6b7c6ac

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;