ar71xx: refresh patches

SVN-Revision: 18693
This commit is contained in:
Gabor Juhos 2009-12-08 10:29:30 +00:00
parent 18867965f7
commit 5c7ee7f039
11 changed files with 34 additions and 34 deletions

View File

@ -1,6 +1,6 @@
--- a/drivers/net/ag71xx/ag71xx_main.c --- a/drivers/net/ag71xx/ag71xx_main.c
+++ b/drivers/net/ag71xx/ag71xx_main.c +++ b/drivers/net/ag71xx/ag71xx_main.c
@@ -587,7 +587,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 net_device *dev = (struct net_device *) data;
struct ag71xx *ag = netdev_priv(dev); struct ag71xx *ag = netdev_priv(dev);
@ -9,7 +9,7 @@
} }
static void ag71xx_tx_timeout(struct net_device *dev) static void ag71xx_tx_timeout(struct net_device *dev)
@@ -743,7 +743,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", DBG("%s: disable polling mode, done=%d, limit=%d\n",
dev->name, done, limit); dev->name, done, limit);
@ -18,7 +18,7 @@
/* enable interrupts */ /* enable interrupts */
spin_lock_irqsave(&ag->lock, flags); spin_lock_irqsave(&ag->lock, flags);
@@ -762,7 +762,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); printk(KERN_DEBUG "%s: out of memory\n", dev->name);
mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL); mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL);
@ -27,7 +27,7 @@
return 0; return 0;
} }
@@ -792,7 +792,7 @@ static irqreturn_t ag71xx_interrupt(int @@ -800,7 +800,7 @@ static irqreturn_t ag71xx_interrupt(int
if (likely(status & AG71XX_INT_POLL)) { if (likely(status & AG71XX_INT_POLL)) {
ag71xx_int_disable(ag, AG71XX_INT_POLL); ag71xx_int_disable(ag, AG71XX_INT_POLL);
DBG("%s: enable polling mode\n", dev->name); DBG("%s: enable polling mode\n", dev->name);

View File

@ -1,6 +1,6 @@
--- a/drivers/net/ag71xx/ag71xx_main.c --- a/drivers/net/ag71xx/ag71xx_main.c
+++ b/drivers/net/ag71xx/ag71xx_main.c +++ b/drivers/net/ag71xx/ag71xx_main.c
@@ -587,7 +587,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 net_device *dev = (struct net_device *) data;
struct ag71xx *ag = netdev_priv(dev); struct ag71xx *ag = netdev_priv(dev);
@ -9,7 +9,7 @@
} }
static void ag71xx_tx_timeout(struct net_device *dev) static void ag71xx_tx_timeout(struct net_device *dev)
@@ -743,7 +743,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", DBG("%s: disable polling mode, done=%d, limit=%d\n",
dev->name, done, limit); dev->name, done, limit);
@ -18,7 +18,7 @@
/* enable interrupts */ /* enable interrupts */
spin_lock_irqsave(&ag->lock, flags); spin_lock_irqsave(&ag->lock, flags);
@@ -762,7 +762,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); printk(KERN_DEBUG "%s: out of memory\n", dev->name);
mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL); mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL);
@ -27,7 +27,7 @@
return 0; return 0;
} }
@@ -792,7 +792,7 @@ static irqreturn_t ag71xx_interrupt(int @@ -800,7 +800,7 @@ static irqreturn_t ag71xx_interrupt(int
if (likely(status & AG71XX_INT_POLL)) { if (likely(status & AG71XX_INT_POLL)) {
ag71xx_int_disable(ag, AG71XX_INT_POLL); ag71xx_int_disable(ag, AG71XX_INT_POLL);
DBG("%s: enable polling mode\n", dev->name); DBG("%s: enable polling mode\n", dev->name);

View File

@ -1,6 +1,6 @@
--- a/drivers/net/ag71xx/ag71xx_main.c --- a/drivers/net/ag71xx/ag71xx_main.c
+++ b/drivers/net/ag71xx/ag71xx_main.c +++ b/drivers/net/ag71xx/ag71xx_main.c
@@ -803,6 +803,18 @@ static void ag71xx_set_multicast_list(st @@ -811,6 +811,18 @@ static void ag71xx_set_multicast_list(st
/* TODO */ /* TODO */
} }
@ -19,7 +19,7 @@
static int __init ag71xx_probe(struct platform_device *pdev) static int __init ag71xx_probe(struct platform_device *pdev)
{ {
struct net_device *dev; struct net_device *dev;
@@ -873,14 +885,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; dev->base_addr = (unsigned long)ag->mac_base;

View File

@ -1,6 +1,6 @@
--- a/arch/mips/ar71xx/devices.c --- a/arch/mips/ar71xx/devices.c
+++ b/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, void __init ar71xx_add_device_dsa(unsigned int id,
struct dsa_platform_data *d) struct dsa_platform_data *d)
{ {
@ -9,7 +9,7 @@
switch (id) { switch (id) {
case 0: case 0:
d->netdev = &ar71xx_eth0_device.dev; 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); id);
return; return;
} }

View File

@ -1,6 +1,6 @@
--- a/drivers/net/ag71xx/ag71xx_main.c --- a/drivers/net/ag71xx/ag71xx_main.c
+++ b/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 net_device *dev = (struct net_device *) data;
struct ag71xx *ag = netdev_priv(dev); struct ag71xx *ag = netdev_priv(dev);
@ -9,7 +9,7 @@
} }
static void ag71xx_tx_timeout(struct net_device *dev) 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", DBG("%s: disable polling mode, done=%d, limit=%d\n",
dev->name, done, limit); dev->name, done, limit);
@ -18,7 +18,7 @@
/* enable interrupts */ /* enable interrupts */
spin_lock_irqsave(&ag->lock, flags); 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); printk(KERN_DEBUG "%s: out of memory\n", dev->name);
mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL); mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL);
@ -27,7 +27,7 @@
return 0; 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)) { if (likely(status & AG71XX_INT_POLL)) {
ag71xx_int_disable(ag, AG71XX_INT_POLL); ag71xx_int_disable(ag, AG71XX_INT_POLL);
DBG("%s: enable polling mode\n", dev->name); DBG("%s: enable polling mode\n", dev->name);

View File

@ -1,6 +1,6 @@
--- a/drivers/net/ag71xx/ag71xx_main.c --- a/drivers/net/ag71xx/ag71xx_main.c
+++ b/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 net_device *dev = (struct net_device *) data;
struct ag71xx *ag = netdev_priv(dev); struct ag71xx *ag = netdev_priv(dev);
@ -9,7 +9,7 @@
} }
static void ag71xx_tx_timeout(struct net_device *dev) 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", DBG("%s: disable polling mode, done=%d, limit=%d\n",
dev->name, done, limit); dev->name, done, limit);
@ -18,7 +18,7 @@
/* enable interrupts */ /* enable interrupts */
spin_lock_irqsave(&ag->lock, flags); 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); printk(KERN_DEBUG "%s: out of memory\n", dev->name);
mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL); mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL);
@ -27,7 +27,7 @@
return 0; 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)) { if (likely(status & AG71XX_INT_POLL)) {
ag71xx_int_disable(ag, AG71XX_INT_POLL); ag71xx_int_disable(ag, AG71XX_INT_POLL);
DBG("%s: enable polling mode\n", dev->name); DBG("%s: enable polling mode\n", dev->name);

View File

@ -1,6 +1,6 @@
--- a/drivers/net/ag71xx/ag71xx_main.c --- a/drivers/net/ag71xx/ag71xx_main.c
+++ b/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 */ /* TODO */
} }
@ -19,7 +19,7 @@
static int __init ag71xx_probe(struct platform_device *pdev) static int __init ag71xx_probe(struct platform_device *pdev)
{ {
struct net_device *dev; 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; dev->base_addr = (unsigned long)ag->mac_base;

View File

@ -1,6 +1,6 @@
--- a/arch/mips/ar71xx/devices.c --- a/arch/mips/ar71xx/devices.c
+++ b/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, void __init ar71xx_add_device_dsa(unsigned int id,
struct dsa_platform_data *d) struct dsa_platform_data *d)
{ {
@ -9,7 +9,7 @@
switch (id) { switch (id) {
case 0: case 0:
d->netdev = &ar71xx_eth0_device.dev; 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); id);
return; return;
} }

View File

@ -1,6 +1,6 @@
--- a/drivers/net/ag71xx/ag71xx_main.c --- a/drivers/net/ag71xx/ag71xx_main.c
+++ b/drivers/net/ag71xx/ag71xx_main.c +++ b/drivers/net/ag71xx/ag71xx_main.c
@@ -593,7 +593,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 net_device *dev = (struct net_device *) data;
struct ag71xx *ag = netdev_priv(dev); struct ag71xx *ag = netdev_priv(dev);
@ -9,7 +9,7 @@
} }
static void ag71xx_tx_timeout(struct net_device *dev) static void ag71xx_tx_timeout(struct net_device *dev)
@@ -749,7 +749,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", DBG("%s: disable polling mode, done=%d, limit=%d\n",
dev->name, done, limit); dev->name, done, limit);
@ -18,7 +18,7 @@
/* enable interrupts */ /* enable interrupts */
spin_lock_irqsave(&ag->lock, flags); spin_lock_irqsave(&ag->lock, flags);
@@ -768,7 +768,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); printk(KERN_DEBUG "%s: out of memory\n", dev->name);
mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL); mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL);
@ -27,7 +27,7 @@
return 0; return 0;
} }
@@ -798,7 +798,7 @@ static irqreturn_t ag71xx_interrupt(int @@ -800,7 +800,7 @@ static irqreturn_t ag71xx_interrupt(int
if (likely(status & AG71XX_INT_POLL)) { if (likely(status & AG71XX_INT_POLL)) {
ag71xx_int_disable(ag, AG71XX_INT_POLL); ag71xx_int_disable(ag, AG71XX_INT_POLL);
DBG("%s: enable polling mode\n", dev->name); DBG("%s: enable polling mode\n", dev->name);

View File

@ -1,6 +1,6 @@
--- a/drivers/net/ag71xx/ag71xx_main.c --- a/drivers/net/ag71xx/ag71xx_main.c
+++ b/drivers/net/ag71xx/ag71xx_main.c +++ b/drivers/net/ag71xx/ag71xx_main.c
@@ -593,7 +593,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 net_device *dev = (struct net_device *) data;
struct ag71xx *ag = netdev_priv(dev); struct ag71xx *ag = netdev_priv(dev);
@ -9,7 +9,7 @@
} }
static void ag71xx_tx_timeout(struct net_device *dev) static void ag71xx_tx_timeout(struct net_device *dev)
@@ -749,7 +749,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", DBG("%s: disable polling mode, done=%d, limit=%d\n",
dev->name, done, limit); dev->name, done, limit);
@ -18,7 +18,7 @@
/* enable interrupts */ /* enable interrupts */
spin_lock_irqsave(&ag->lock, flags); spin_lock_irqsave(&ag->lock, flags);
@@ -768,7 +768,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); printk(KERN_DEBUG "%s: out of memory\n", dev->name);
mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL); mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL);
@ -27,7 +27,7 @@
return 0; return 0;
} }
@@ -798,7 +798,7 @@ static irqreturn_t ag71xx_interrupt(int @@ -800,7 +800,7 @@ static irqreturn_t ag71xx_interrupt(int
if (likely(status & AG71XX_INT_POLL)) { if (likely(status & AG71XX_INT_POLL)) {
ag71xx_int_disable(ag, AG71XX_INT_POLL); ag71xx_int_disable(ag, AG71XX_INT_POLL);
DBG("%s: enable polling mode\n", dev->name); DBG("%s: enable polling mode\n", dev->name);

View File

@ -1,6 +1,6 @@
--- a/drivers/net/ag71xx/ag71xx_main.c --- a/drivers/net/ag71xx/ag71xx_main.c
+++ b/drivers/net/ag71xx/ag71xx_main.c +++ b/drivers/net/ag71xx/ag71xx_main.c
@@ -809,6 +809,18 @@ static void ag71xx_set_multicast_list(st @@ -811,6 +811,18 @@ static void ag71xx_set_multicast_list(st
/* TODO */ /* TODO */
} }
@ -19,7 +19,7 @@
static int __init ag71xx_probe(struct platform_device *pdev) static int __init ag71xx_probe(struct platform_device *pdev)
{ {
struct net_device *dev; struct net_device *dev;
@@ -884,14 +896,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; dev->base_addr = (unsigned long)ag->mac_base;