aca39a431640e91f036af9b8ada46f97c3e45ca8
[openwrt/svn-archive/archive.git] / target / linux / ar71xx / patches-2.6.30 / 800-ag71xx-remove-netdev-arg-from-napi-calls.patch
1 --- a/drivers/net/ag71xx/ag71xx_main.c
2 +++ b/drivers/net/ag71xx/ag71xx_main.c
3 @@ -575,7 +575,7 @@ static void ag71xx_oom_timer_handler(uns
4 struct net_device *dev = (struct net_device *) data;
5 struct ag71xx *ag = netdev_priv(dev);
6
7 - netif_rx_schedule(dev, &ag->napi);
8 + netif_rx_schedule(&ag->napi);
9 }
10
11 static void ag71xx_tx_timeout(struct net_device *dev)
12 @@ -731,7 +731,7 @@ static int ag71xx_poll(struct napi_struc
13 DBG("%s: disable polling mode, done=%d, limit=%d\n",
14 dev->name, done, limit);
15
16 - netif_rx_complete(dev, napi);
17 + netif_rx_complete(napi);
18
19 /* enable interrupts */
20 spin_lock_irqsave(&ag->lock, flags);
21 @@ -750,7 +750,7 @@ static int ag71xx_poll(struct napi_struc
22 printk(KERN_DEBUG "%s: out of memory\n", dev->name);
23
24 mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL);
25 - netif_rx_complete(dev, napi);
26 + netif_rx_complete(napi);
27 return 0;
28 }
29
30 @@ -780,7 +780,7 @@ static irqreturn_t ag71xx_interrupt(int
31 if (likely(status & AG71XX_INT_POLL)) {
32 ag71xx_int_disable(ag, AG71XX_INT_POLL);
33 DBG("%s: enable polling mode\n", dev->name);
34 - netif_rx_schedule(dev, &ag->napi);
35 + netif_rx_schedule(&ag->napi);
36 }
37
38 return IRQ_HANDLED;