1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-25 01:44:39 +02:00
openwrt-xburst/target/linux/ar71xx/patches-2.6.31/801-ag71xx-remove-redundant-napi-functions.patch
juhosg 118b74e6cd [ar71xx] add patches for 2.6.31
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17366 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-08-24 19:29:50 +00:00

39 lines
1.1 KiB
Diff

--- a/drivers/net/ag71xx/ag71xx_main.c
+++ b/drivers/net/ag71xx/ag71xx_main.c
@@ -575,7 +575,7 @@ static void ag71xx_oom_timer_handler(uns
struct net_device *dev = (struct net_device *) data;
struct ag71xx *ag = netdev_priv(dev);
- netif_rx_schedule(&ag->napi);
+ napi_schedule(&ag->napi);
}
static void ag71xx_tx_timeout(struct net_device *dev)
@@ -731,7 +731,7 @@ static int ag71xx_poll(struct napi_struc
DBG("%s: disable polling mode, done=%d, limit=%d\n",
dev->name, done, limit);
- netif_rx_complete(napi);
+ napi_complete(napi);
/* enable interrupts */
spin_lock_irqsave(&ag->lock, flags);
@@ -750,7 +750,7 @@ static int ag71xx_poll(struct napi_struc
printk(KERN_DEBUG "%s: out of memory\n", dev->name);
mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL);
- netif_rx_complete(napi);
+ napi_complete(napi);
return 0;
}
@@ -780,7 +780,7 @@ static irqreturn_t ag71xx_interrupt(int
if (likely(status & AG71XX_INT_POLL)) {
ag71xx_int_disable(ag, AG71XX_INT_POLL);
DBG("%s: enable polling mode\n", dev->name);
- netif_rx_schedule(&ag->napi);
+ napi_schedule(&ag->napi);
}
return IRQ_HANDLED;