---

yaml --- r: 189864 b: refs/heads/master c: dac8761 h: refs/heads/master v: v3
git-mirror · Apr 13, 2010 · e9c5dac · e9c5dac
1 parent cc0ac0f
commit e9c5dac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5aa22520dbb49e726420ca56b3dcfe56724d33e
+refs/heads/master: dac876193cd79ced36d0462749ea47c05844fb49
diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c
@@ -661,6 +661,8 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)
 				i = 0;
 		}
 
+		if (i == tx_ring->next_to_use)
+			break;
 		eop = tx_ring->buffer_info[i].next_to_watch;
 		eop_desc = E1000_TX_DESC(*tx_ring, eop);
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
     				i = 0;
     		}
+    		if (i == tx_ring->next_to_use)
+    			break;
     		eop = tx_ring->buffer_info[i].next_to_watch;
     		eop_desc = E1000_TX_DESC(*tx_ring, eop);
     	}
@@ Expand Down @@