---

yaml --- r: 15798 b: refs/heads/master c: 3e4b32e h: refs/heads/master v: v3
git-mirror · Dec 12, 2005 · 800824f · 800824f
1 parent a2a73d8
commit 800824f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af2a58acb12f6b19e6f04b730203e199abedc44a
+refs/heads/master: 3e4b32e11674a40cf50e48a79764f12988641e20
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
@@ -1736,7 +1736,6 @@ static int sky2_poll(struct net_device *dev0, int *budget)
 	u16 hwidx;
 	u16 tx_done[2] = { TX_NO_STATUS, TX_NO_STATUS };
 
-	sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ);
 	hwidx = sky2_read16(hw, STAT_PUT_IDX);
 	BUG_ON(hwidx >= STATUS_RING_SIZE);
 	rmb();
@@ -1754,8 +1753,6 @@ static int sky2_poll(struct net_device *dev0, int *budget)
 		hw->st_idx = (hw->st_idx + 1) % STATUS_RING_SIZE;
 		prefetch(hw->st_le + hw->st_idx);
 
-		BUG_ON(le->link >= hw->ports || !hw->dev[le->link]);
-
 		BUG_ON(le->link >= 2);
 		dev = hw->dev[le->link];
 		if (dev == NULL || !netif_running(dev))
@@ -1821,12 +1818,13 @@ static int sky2_poll(struct net_device *dev0, int *budget)
 	}
 
 exit_loop:
+	sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ);
 	mmiowb();
 
 	sky2_tx_check(hw, 0, tx_done[0]);
 	sky2_tx_check(hw, 1, tx_done[1]);
 
-	if (work_done < to_do) {
+	if (sky2_read16(hw, STAT_PUT_IDX) == hw->st_idx) {
 		/* need to restart TX timer */
 		if (is_ec_a1(hw)) {
 			sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_STOP);