aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2005-12-01 11:41:32 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-12-03 20:29:03 -0500
commitf89c2b464558a21fd3be8d578b7d13e810fb6b8a (patch)
treeffac18b8c1a929ff57af0d626b10cb383d0fd2ad
parentd359b6ff6a79e250422fdfa991b36d37c286eda1 (diff)
[PATCH] sky2: interrupt not cleared.
One of the rearrangements dropped this and it means sky2 spins in napi/interrupt. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r--drivers/net/sky2.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index a1884b472cd0..7dc5b4821ae4 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1739,6 +1739,7 @@ static int sky2_poll(struct net_device *dev0, int *budget)
1739 unsigned int work_done = 0; 1739 unsigned int work_done = 0;
1740 u16 hwidx; 1740 u16 hwidx;
1741 1741
1742 sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ);
1742 hwidx = sky2_read16(hw, STAT_PUT_IDX); 1743 hwidx = sky2_read16(hw, STAT_PUT_IDX);
1743 BUG_ON(hwidx >= STATUS_RING_SIZE); 1744 BUG_ON(hwidx >= STATUS_RING_SIZE);
1744 rmb(); 1745 rmb();