hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ag71xx driver: fix return code of the napi poll routine, was broken since [13545] (patch by Ubiquiti Networks) 

SVN-Revision: 14496
lede-17.01
Gabor Juhos 2009-02-13 11:16:57 +00:00
parent 4bcc027e97
commit 39628cdd5f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
View File

@ -38,7 +38,7 @@
#define ETH_FCS_LEN 4 #define ETH_FCS_LEN 4
#define AG71XX_DRV_NAME "ag71xx" #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_NAPI_WEIGHT 64
#define AG71XX_OOM_REFILL (1 + HZ/10) #define AG71XX_OOM_REFILL (1 + HZ/10)

6
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
View File

@ -716,13 +716,13 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
spin_lock_irqsave(&ag->lock, flags); spin_lock_irqsave(&ag->lock, flags);
ag71xx_int_enable(ag, AG71XX_INT_POLL); ag71xx_int_enable(ag, AG71XX_INT_POLL);
spin_unlock_irqrestore(&ag->lock, flags); spin_unlock_irqrestore(&ag->lock, flags);
return 0; return done;
} }
more: more:
DBG("%s: stay in polling mode, done=%d, limit=%d\n", DBG("%s: stay in polling mode, done=%d, limit=%d\n",
dev->name, done, limit); dev->name, done, limit);
return 1; return done;
oom: oom:
if (netif_msg_rx_err(ag)) 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); mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL);
netif_rx_complete(dev, napi); netif_rx_complete(dev, napi);
return 0; return done;
} }
static irqreturn_t ag71xx_interrupt(int irq, void *dev_id) static irqreturn_t ag71xx_interrupt(int irq, void *dev_id)