Skip to content

Commit

Permalink
[PATCH] sky2: NAPI poll fix
Browse files Browse the repository at this point in the history
When sky2 driver gets lots of received packets at once, it can get stuck.
The NAPI poll routine gets called back to keep going, but since no IRQ bits
are set it doesn't make progress.

Increase version, since this is serious enough problem that I want to be
able to tell new from old problems.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Stephen Hemminger authored and Jeff Garzik committed Jul 17, 2006
1 parent 83b0fe8 commit caa0371
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/net/sky2.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
#include "sky2.h"

#define DRV_NAME "sky2"
#define DRV_VERSION "1.4"
#define DRV_VERSION "1.5"
#define PFX DRV_NAME " "

/*
Expand Down Expand Up @@ -2204,9 +2204,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);

Expand Down Expand Up @@ -2243,7 +2240,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);
Expand Down

0 comments on commit caa0371

Please sign in to comment.