|
@@ -2105,7 +2105,6 @@ static int sky2_poll(struct net_device *dev0, int *budget)
|
|
|
int work_done = 0;
|
|
|
u32 status = sky2_read32(hw, B0_Y2_SP_EISR);
|
|
|
|
|
|
- restart_poll:
|
|
|
if (unlikely(status & ~Y2_IS_STAT_BMU)) {
|
|
|
if (status & Y2_IS_HW_ERR)
|
|
|
sky2_hw_intr(hw);
|
|
@@ -2136,7 +2135,7 @@ static int sky2_poll(struct net_device *dev0, int *budget)
|
|
|
}
|
|
|
|
|
|
if (status & Y2_IS_STAT_BMU) {
|
|
|
- work_done += sky2_status_intr(hw, work_limit - work_done);
|
|
|
+ work_done = sky2_status_intr(hw, work_limit);
|
|
|
*budget -= work_done;
|
|
|
dev0->quota -= work_done;
|
|
|
|
|
@@ -2148,22 +2147,9 @@ static int sky2_poll(struct net_device *dev0, int *budget)
|
|
|
|
|
|
mod_timer(&hw->idle_timer, jiffies + HZ);
|
|
|
|
|
|
- local_irq_disable();
|
|
|
- __netif_rx_complete(dev0);
|
|
|
+ netif_rx_complete(dev0);
|
|
|
|
|
|
status = sky2_read32(hw, B0_Y2_SP_LISR);
|
|
|
-
|
|
|
- if (unlikely(status)) {
|
|
|
- /* More work pending, try and keep going */
|
|
|
- if (__netif_rx_schedule_prep(dev0)) {
|
|
|
- __netif_rx_reschedule(dev0, work_done);
|
|
|
- status = sky2_read32(hw, B0_Y2_SP_EISR);
|
|
|
- local_irq_enable();
|
|
|
- goto restart_poll;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- local_irq_enable();
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -2181,6 +2167,8 @@ static irqreturn_t sky2_intr(int irq, void *dev_id, struct pt_regs *regs)
|
|
|
prefetch(&hw->st_le[hw->st_idx]);
|
|
|
if (likely(__netif_rx_schedule_prep(dev0)))
|
|
|
__netif_rx_schedule(dev0);
|
|
|
+ else
|
|
|
+ printk(KERN_DEBUG PFX "irq race detected\n");
|
|
|
|
|
|
return IRQ_HANDLED;
|
|
|
}
|