diff options
author | Stephen Hemminger <shemminger@osdl.org> | 2006-07-17 13:51:50 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-06 20:52:14 -0700 |
commit | 1e1f0476535c248fb65ac11e1ae4adee221a2fc3 (patch) | |
tree | 9f6f2ce24f8766a0228181cbace117dd3ccd9359 /drivers | |
parent | e932b368e48ce2b9caf82c505b938a711ed4e045 (diff) |
sky2: NAPI bug
If the sky2 driver decides to defer processing because it's NAPI
packet quota is done, then it won't correctly handle the rest
when it is rescheduled.
Signed-off-by: Stephen Hemminger <sch@sch-laptop.localdomain>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/sky2.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index fba1e4d4d83..a3cd0b37385 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -2187,9 +2187,6 @@ static int sky2_poll(struct net_device *dev0, int *budget) int work_done = 0; u32 status = sky2_read32(hw, B0_Y2_SP_EISR); - if (!~status) - goto out; - if (status & Y2_IS_HW_ERR) sky2_hw_intr(hw); @@ -2226,7 +2223,7 @@ static int sky2_poll(struct net_device *dev0, int *budget) if (sky2_more_work(hw)) return 1; -out: + netif_rx_complete(dev0); sky2_read32(hw, B0_Y2_SP_LISR); |