diff options
| author |   Stephen Hemminger <shemminger@osdl.org> | 2006-01-30 11:37:58 -0800 |
|---|---|---|
| committer |   Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 02:00:35 -0500 |
| commit | f9a66c7f5fa2262656a1a38ae9b57a2a89980f36 (patch) | |
| tree | 84c9b58afbeaabc9d8468b6783d7bc827f7eeeae /drivers | |
| parent | [PATCH] sky2: set mac address fix (diff) | |
| download | linux-dev-f9a66c7f5fa2262656a1a38ae9b57a2a89980f36.tar.xz linux-dev-f9a66c7f5fa2262656a1a38ae9b57a2a89980f36.zip | |
[PATCH] sky2: clear irq race
Move the interrupt clear to before processing, this avoids a
possible races with status delaying.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/sky2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 6cd075e1f38a..aff7b9dee38e 100644 --- a/drivers/net/sky2.c +++ b/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); |