diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-04-24 06:46:51 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-04-24 06:46:51 +0000 |
| commit | dbfcd5a880e2c890ac5dc89540bc900e8ef26817 (patch) | |
| tree | 4ae1a339377319c46eaea403f7f2f7956632df4d | |
| parent | 0f6bde5bf3be5ae2e409e638082efa88e8c43411 (diff) | |
| download | upstream-dbfcd5a880e2c890ac5dc89540bc900e8ef26817.tar.gz upstream-dbfcd5a880e2c890ac5dc89540bc900e8ef26817.tar.bz2 upstream-dbfcd5a880e2c890ac5dc89540bc900e8ef26817.zip | |
[ar71xx] fix ethernet driver on 2.6.29
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15371 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/ar71xx/config-2.6.29 | 4 | ||||
| -rw-r--r-- | target/linux/ar71xx/patches-2.6.29/800-ag71xx-remove-netdev-arg-from-napi-calls.patch | 38 |
2 files changed, 41 insertions, 1 deletions
diff --git a/target/linux/ar71xx/config-2.6.29 b/target/linux/ar71xx/config-2.6.29 index 6cea30676d..519271ce41 100644 --- a/target/linux/ar71xx/config-2.6.29 +++ b/target/linux/ar71xx/config-2.6.29 @@ -1,7 +1,9 @@ CONFIG_32BIT=y # CONFIG_64BIT is not set 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_MACH_AP81=y CONFIG_AR71XX_MACH_AP83=y diff --git a/target/linux/ar71xx/patches-2.6.29/800-ag71xx-remove-netdev-arg-from-napi-calls.patch b/target/linux/ar71xx/patches-2.6.29/800-ag71xx-remove-netdev-arg-from-napi-calls.patch new file mode 100644 index 0000000000..d139c5330d --- /dev/null +++ b/target/linux/ar71xx/patches-2.6.29/800-ag71xx-remove-netdev-arg-from-napi-calls.patch @@ -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; |