fix ethernet driver on 2.6.29

SVN-Revision: 15371
This commit is contained in:
Gabor Juhos 2009-04-24 06:46:51 +00:00
parent dcd9f20085
commit 70795466b9
2 changed files with 41 additions and 1 deletions

View file

@ -1,7 +1,9 @@
CONFIG_32BIT=y CONFIG_32BIT=y
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_ADM6996_PHY=y CONFIG_ADM6996_PHY=y
# CONFIG_AG71XX is not set CONFIG_AG71XX=y
CONFIG_AG71XX_AR8216_SUPPORT=y
# CONFIG_AG71XX_DEBUG is not set
# CONFIG_AR71XX_EARLY_SERIAL is not set # CONFIG_AR71XX_EARLY_SERIAL is not set
CONFIG_AR71XX_MACH_AP81=y CONFIG_AR71XX_MACH_AP81=y
CONFIG_AR71XX_MACH_AP83=y CONFIG_AR71XX_MACH_AP83=y

View file

@ -0,0 +1,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(dev, &ag->napi);
+ netif_rx_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(dev, napi);
+ netif_rx_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(dev, napi);
+ netif_rx_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(dev, &ag->napi);
+ netif_rx_schedule(&ag->napi);
}
return IRQ_HANDLED;