From e2336576e9fb9c8a21f230cc796bade928bfc67e Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Mon, 30 Jan 2006 11:37:58 -0800
Subject: [PATCH] --- yaml --- r: 19865 b: refs/heads/master c:
 f9a66c7f5fa2262656a1a38ae9b57a2a89980f36 h: refs/heads/master i:   19863:
 cb1f4e50537512e8cd5d624dfae77c550cd4e142 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/sky2.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0e152d5ac282..1deff085c347 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8ab1ec0c3ef4ce2033abe3441d032fe1490a71a
+refs/heads/master: f9a66c7f5fa2262656a1a38ae9b57a2a89980f36
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index 6cd075e1f38a..aff7b9dee38e 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -1833,6 +1833,8 @@ 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();
@@ -1912,12 +1914,10 @@ static int sky2_poll(struct net_device *dev0, int *budget)
 	}
 
 exit_loop:
-	sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ);
-
 	sky2_tx_check(hw, 0, tx_done[0]);
 	sky2_tx_check(hw, 1, tx_done[1]);
 
-	if (sky2_read16(hw, STAT_PUT_IDX) == hw->st_idx) {
+	if (likely(work_done < to_do)) {
 		/* need to restart TX timer */
 		if (is_ec_a1(hw)) {
 			sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_STOP);