2009-08-25 03:29:50 +08:00
|
|
|
--- a/drivers/net/ag71xx/ag71xx_main.c
|
|
|
|
+++ b/drivers/net/ag71xx/ag71xx_main.c
|
2009-12-03 22:17:07 +08:00
|
|
|
@@ -589,7 +589,7 @@ static void ag71xx_oom_timer_handler(uns
|
2009-08-25 03:29:50 +08:00
|
|
|
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)
|
2009-12-03 22:17:07 +08:00
|
|
|
@@ -745,7 +745,7 @@ static int ag71xx_poll(struct napi_struc
|
2009-08-25 03:29:50 +08:00
|
|
|
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);
|
2009-12-03 22:17:07 +08:00
|
|
|
@@ -764,7 +764,7 @@ static int ag71xx_poll(struct napi_struc
|
2009-08-25 03:29:50 +08:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2009-12-03 22:17:07 +08:00
|
|
|
@@ -794,7 +794,7 @@ static irqreturn_t ag71xx_interrupt(int
|
2009-08-25 03:29:50 +08:00
|
|
|
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;
|