diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-02-13 11:16:57 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-02-13 11:16:57 +0000 |
| commit | 39628cdd5f0d65456e00c88f8df48b3efa6ed336 (patch) | |
| tree | 0ed1c2d680251ec86b3936df948772e025fcbb1d | |
| parent | 4bcc027e97be80cd17745ab21081060db7417480 (diff) | |
| download | upstream-39628cdd5f0d65456e00c88f8df48b3efa6ed336.tar.gz upstream-39628cdd5f0d65456e00c88f8df48b3efa6ed336.tar.bz2 upstream-39628cdd5f0d65456e00c88f8df48b3efa6ed336.zip | |
ag71xx driver: fix return code of the napi poll routine, was broken since [13545] (patch by Ubiquiti Networks)
SVN-Revision: 14496
| -rw-r--r-- | target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h | 2 | ||||
| -rw-r--r-- | target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h index 1e0774cda5..60ee3d9b66 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h @@ -38,7 +38,7 @@ #define ETH_FCS_LEN 4 #define AG71XX_DRV_NAME "ag71xx" -#define AG71XX_DRV_VERSION "0.5.18" +#define AG71XX_DRV_VERSION "0.5.19" #define AG71XX_NAPI_WEIGHT 64 #define AG71XX_OOM_REFILL (1 + HZ/10) diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c index fd203702b8..db1855b9ac 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c @@ -716,13 +716,13 @@ static int ag71xx_poll(struct napi_struct *napi, int limit) spin_lock_irqsave(&ag->lock, flags); ag71xx_int_enable(ag, AG71XX_INT_POLL); spin_unlock_irqrestore(&ag->lock, flags); - return 0; + return done; } more: DBG("%s: stay in polling mode, done=%d, limit=%d\n", dev->name, done, limit); - return 1; + return done; oom: if (netif_msg_rx_err(ag)) @@ -730,7 +730,7 @@ static int ag71xx_poll(struct napi_struct *napi, int limit) mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL); netif_rx_complete(dev, napi); - return 0; + return done; } static irqreturn_t ag71xx_interrupt(int irq, void *dev_id) |