summaryrefslogtreecommitdiff
path: root/target/linux/ar71xx/patches-2.6.30/801-ag71xx-remove-redundant-napi-functions.patch
blob: 281992117ec64f8865be3919d71477388af03b19 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
--- a/drivers/net/ag71xx/ag71xx_main.c
+++ b/drivers/net/ag71xx/ag71xx_main.c
@@ -561,7 +561,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)
@@ -717,7 +717,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);
@@ -736,7 +736,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;
 }
 
@@ -766,7 +766,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;