aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-02-13 11:16:57 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-02-13 11:16:57 +0000
commiteeb502575ed4c38ee5d97593c17fa329282abc56 (patch)
tree83583d17d91c34c5906409674ac6bfdf157ed58a
parent886d8c80aebaf32c85e91298d687425168c7d10b (diff)
downloadupstream-eeb502575ed4c38ee5d97593c17fa329282abc56.tar.gz
upstream-eeb502575ed4c38ee5d97593c17fa329282abc56.tar.bz2
upstream-eeb502575ed4c38ee5d97593c17fa329282abc56.zip
[ar71xx] ag71xx driver: fix return code of the napi poll routine, was broken since [13545] (patch by Ubiquiti Networks)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14496 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h2
-rw-r--r--target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c6
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)