aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-06-01 18:27:51 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-06-01 18:27:51 +0000
commit05b40c8d131f4027bf94f5cdeb571f1699e88ed8 (patch)
tree0d94a7634b534d2ac30195a83e3e9f4f3f4ba2e6 /target/linux
parent1a1dc17ca3c882f35d7c674cd95b82ddfd06a550 (diff)
downloadupstream-05b40c8d131f4027bf94f5cdeb571f1699e88ed8.tar.gz
upstream-05b40c8d131f4027bf94f5cdeb571f1699e88ed8.tar.bz2
upstream-05b40c8d131f4027bf94f5cdeb571f1699e88ed8.zip
backport an upstream fix: We're not disabling IRQ, so we must call the irq safe flavour of netif_rx_complete, should fix some crashes when running the system for a long time
SVN-Revision: 16277
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/brcm63xx/files/drivers/net/bcm63xx_enet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/brcm63xx/files/drivers/net/bcm63xx_enet.c b/target/linux/brcm63xx/files/drivers/net/bcm63xx_enet.c
index 40c25651d6..3dd170d686 100644
--- a/target/linux/brcm63xx/files/drivers/net/bcm63xx_enet.c
+++ b/target/linux/brcm63xx/files/drivers/net/bcm63xx_enet.c
@@ -450,7 +450,7 @@ static int bcm_enet_poll(struct napi_struct *napi, int budget)
/* no more packet in rx/tx queue, remove device from poll
* queue */
- __netif_rx_complete(dev, napi);
+ netif_rx_complete(dev, napi);
/* restore rx/tx interrupt */
enet_dma_writel(priv, ENETDMA_IR_PKTDONE_MASK,