>From e9a7e8c1863a998428046bf7eaf7951379645822 Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Thu, 18 Jun 2009 20:37:41 +0900 Subject: [PATCH] Fix a race condition in sky2_poll Clear interrupt only when the status buffer is fully drained, Make sure to clear interrupt when work_done == work_limit and the buffer is drained. --- drivers/net/sky2.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 7681d28..ca1e9e5 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -2524,9 +2524,6 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do, u16 idx) } } while (hw->st_idx != idx); - /* Fully processed status ring so clear irq */ - sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ); - exit_loop: sky2_rx_done(hw, 0, total_packets[0], total_bytes[0]); sky2_rx_done(hw, 1, total_packets[1], total_bytes[1]); @@ -2779,9 +2776,16 @@ static int sky2_poll(struct napi_struct *napi, int work_limit) if (status & Y2_IS_IRQ_PHY2) sky2_phy_intr(hw, 1); - while ((idx = sky2_read16(hw, STAT_PUT_IDX)) != hw->st_idx) { + idx = sky2_read16(hw, STAT_PUT_IDX); + while (idx != hw->st_idx) { work_done += sky2_status_intr(hw, work_limit - work_done, idx); + /* If we fully processed the status ring, clear the irq */ + idx = sky2_read16(hw, STAT_PUT_IDX); + if (idx == hw->st_idx) { + sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ); + break; + } if (work_done >= work_limit) goto done; } -- 1.5.6.5