ar71xx: refresh 2.6.30 patches

SVN-Revision: 18623
This commit is contained in:
Gabor Juhos 2009-12-03 15:07:44 +00:00
parent f065bbdf7f
commit 4692b4e31e
4 changed files with 12 additions and 12 deletions

View file

@ -1,6 +1,6 @@
--- a/drivers/net/ag71xx/ag71xx_main.c
+++ b/drivers/net/ag71xx/ag71xx_main.c
@@ -575,7 +575,7 @@ static void ag71xx_oom_timer_handler(uns
@@ -587,7 +587,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)
@@ -731,7 +731,7 @@ static int ag71xx_poll(struct napi_struc
@@ -743,7 +743,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);
@@ -750,7 +750,7 @@ static int ag71xx_poll(struct napi_struc
@@ -762,7 +762,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;
}
@@ -780,7 +780,7 @@ static irqreturn_t ag71xx_interrupt(int
@@ -792,7 +792,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);

View file

@ -1,6 +1,6 @@
--- a/drivers/net/ag71xx/ag71xx_main.c
+++ b/drivers/net/ag71xx/ag71xx_main.c
@@ -575,7 +575,7 @@ static void ag71xx_oom_timer_handler(uns
@@ -587,7 +587,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)
@@ -731,7 +731,7 @@ static int ag71xx_poll(struct napi_struc
@@ -743,7 +743,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);
@@ -750,7 +750,7 @@ static int ag71xx_poll(struct napi_struc
@@ -762,7 +762,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;
}
@@ -780,7 +780,7 @@ static irqreturn_t ag71xx_interrupt(int
@@ -792,7 +792,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);

View file

@ -1,6 +1,6 @@
--- a/drivers/net/ag71xx/ag71xx_main.c
+++ b/drivers/net/ag71xx/ag71xx_main.c
@@ -791,6 +791,18 @@ static void ag71xx_set_multicast_list(st
@@ -803,6 +803,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;
@@ -861,14 +873,9 @@ static int __init ag71xx_probe(struct pl
@@ -873,14 +885,9 @@ static int __init ag71xx_probe(struct pl
}
dev->base_addr = (unsigned long)ag->mac_base;

View file

@ -1,6 +1,6 @@
--- a/arch/mips/ar71xx/devices.c
+++ b/arch/mips/ar71xx/devices.c
@@ -780,6 +780,8 @@ static struct platform_device ar71xx_dsa
@@ -822,6 +822,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;
@@ -793,7 +795,10 @@ void __init ar71xx_add_device_dsa(unsign
@@ -835,7 +837,10 @@ void __init ar71xx_add_device_dsa(unsign
id);
return;
}