diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-12-08 10:29:30 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-12-08 10:29:30 +0000 |
| commit | 5c7ee7f0397deddf7245a560590edadb60019ed2 (patch) | |
| tree | e8076cc73d41993390e44a7d7fb3b01cf12b296e /target/linux/ar71xx/patches-2.6.31 | |
| parent | 18867965f79a4dc13db50cdc529c102373da64a8 (diff) | |
| download | upstream-5c7ee7f0397deddf7245a560590edadb60019ed2.tar.gz upstream-5c7ee7f0397deddf7245a560590edadb60019ed2.tar.bz2 upstream-5c7ee7f0397deddf7245a560590edadb60019ed2.zip | |
ar71xx: refresh patches
SVN-Revision: 18693
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.31')
4 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/ar71xx/patches-2.6.31/800-ag71xx-remove-netdev-arg-from-napi-calls.patch b/target/linux/ar71xx/patches-2.6.31/800-ag71xx-remove-netdev-arg-from-napi-calls.patch index 982e68d8be..bd2294302a 100644 --- a/target/linux/ar71xx/patches-2.6.31/800-ag71xx-remove-netdev-arg-from-napi-calls.patch +++ b/target/linux/ar71xx/patches-2.6.31/800-ag71xx-remove-netdev-arg-from-napi-calls.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ag71xx/ag71xx_main.c +++ b/drivers/net/ag71xx/ag71xx_main.c -@@ -589,7 +589,7 @@ static void ag71xx_oom_timer_handler(uns +@@ -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); @@ -9,7 +9,7 @@ } static void ag71xx_tx_timeout(struct net_device *dev) -@@ -745,7 +745,7 @@ static int ag71xx_poll(struct napi_struc +@@ -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); @@ -18,7 +18,7 @@ /* enable interrupts */ spin_lock_irqsave(&ag->lock, flags); -@@ -764,7 +764,7 @@ static int ag71xx_poll(struct napi_struc +@@ -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); @@ -27,7 +27,7 @@ return 0; } -@@ -794,7 +794,7 @@ static irqreturn_t ag71xx_interrupt(int +@@ -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); diff --git a/target/linux/ar71xx/patches-2.6.31/801-ag71xx-remove-redundant-napi-functions.patch b/target/linux/ar71xx/patches-2.6.31/801-ag71xx-remove-redundant-napi-functions.patch index 7c6996e1b9..b5e779bcf6 100644 --- a/target/linux/ar71xx/patches-2.6.31/801-ag71xx-remove-redundant-napi-functions.patch +++ b/target/linux/ar71xx/patches-2.6.31/801-ag71xx-remove-redundant-napi-functions.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ag71xx/ag71xx_main.c +++ b/drivers/net/ag71xx/ag71xx_main.c -@@ -589,7 +589,7 @@ static void ag71xx_oom_timer_handler(uns +@@ -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); @@ -9,7 +9,7 @@ } static void ag71xx_tx_timeout(struct net_device *dev) -@@ -745,7 +745,7 @@ static int ag71xx_poll(struct napi_struc +@@ -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); @@ -18,7 +18,7 @@ /* enable interrupts */ spin_lock_irqsave(&ag->lock, flags); -@@ -764,7 +764,7 @@ static int ag71xx_poll(struct napi_struc +@@ -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); @@ -27,7 +27,7 @@ return 0; } -@@ -794,7 +794,7 @@ static irqreturn_t ag71xx_interrupt(int +@@ -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); diff --git a/target/linux/ar71xx/patches-2.6.31/802-ag71xx-use-netdev-ops.patch b/target/linux/ar71xx/patches-2.6.31/802-ag71xx-use-netdev-ops.patch index 3067b49a49..f619611c64 100644 --- a/target/linux/ar71xx/patches-2.6.31/802-ag71xx-use-netdev-ops.patch +++ b/target/linux/ar71xx/patches-2.6.31/802-ag71xx-use-netdev-ops.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ag71xx/ag71xx_main.c +++ b/drivers/net/ag71xx/ag71xx_main.c -@@ -805,6 +805,18 @@ static void ag71xx_set_multicast_list(st +@@ -811,6 +811,18 @@ static void ag71xx_set_multicast_list(st /* TODO */ } @@ -19,7 +19,7 @@ static int __init ag71xx_probe(struct platform_device *pdev) { struct net_device *dev; -@@ -875,14 +887,9 @@ static int __init ag71xx_probe(struct pl +@@ -886,14 +898,9 @@ static int __init ag71xx_probe(struct pl } dev->base_addr = (unsigned long)ag->mac_base; diff --git a/target/linux/ar71xx/patches-2.6.31/803-ar71xx-update-dsa-switch-support.patch b/target/linux/ar71xx/patches-2.6.31/803-ar71xx-update-dsa-switch-support.patch index b78c5d41a4..ac2c7d9251 100644 --- a/target/linux/ar71xx/patches-2.6.31/803-ar71xx-update-dsa-switch-support.patch +++ b/target/linux/ar71xx/patches-2.6.31/803-ar71xx-update-dsa-switch-support.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ar71xx/devices.c +++ b/arch/mips/ar71xx/devices.c -@@ -822,6 +822,8 @@ static struct platform_device ar71xx_dsa +@@ -825,6 +825,8 @@ static struct platform_device ar71xx_dsa void __init ar71xx_add_device_dsa(unsigned int id, struct dsa_platform_data *d) { @@ -9,7 +9,7 @@ switch (id) { case 0: d->netdev = &ar71xx_eth0_device.dev; -@@ -835,7 +837,10 @@ void __init ar71xx_add_device_dsa(unsign +@@ -838,7 +840,10 @@ void __init ar71xx_add_device_dsa(unsign id); return; } |