ar71xx: merge ag71xx specific patches

[openwrt-10.03/.git] / target / linux / ar71xx / patches-2.6.30 / 800-ag71xx-remove-netdev-arg-from-napi-calls.patch

diff --git a/target/linux/ar71xx/patches-2.6.30/800-ag71xx-remove-netdev-arg-from-napi-calls.patch b/target/linux/ar71xx/patches-2.6.30/800-ag71xx-remove-netdev-arg-from-napi-calls.patch
deleted file mode 100644 (file)
index bd22943..0000000
--- a/target/linux/ar71xx/patches-2.6.30/800-ag71xx-remove-netdev-arg-from-napi-calls.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/drivers/net/ag71xx/ag71xx_main.c
-+++ b/drivers/net/ag71xx/ag71xx_main.c
-@@ -595,7 +595,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(dev, &ag->napi);
-+      netif_rx_schedule(&ag->napi);
- }
- 
- static void ag71xx_tx_timeout(struct net_device *dev)
-@@ -751,7 +751,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(dev, napi);
-+              netif_rx_complete(napi);
- 
-               /* enable interrupts */
-               spin_lock_irqsave(&ag->lock, flags);
-@@ -770,7 +770,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(dev, napi);
-+      netif_rx_complete(napi);
-       return 0;
- }
- 
-@@ -800,7 +800,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(dev, &ag->napi);
-+              netif_rx_schedule(&ag->napi);
-       }
- 
-       return IRQ_HANDLED;