ar71xx: refresh 2.6.31 patches
SVN-Revision: 18618
This commit is contained in:
parent
6cb040903b
commit
a1e1fc7707
5 changed files with 13 additions and 13 deletions
|
@ -1,6 +1,6 @@
|
||||||
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||||
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||||
@@ -1579,7 +1579,7 @@ static int __xipram do_erase_chip(struct
|
@@ -1568,7 +1568,7 @@ static int __xipram do_erase_chip(struct
|
||||||
chip->erase_suspended = 0;
|
chip->erase_suspended = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (time_after(jiffies, timeo)) {
|
if (time_after(jiffies, timeo)) {
|
||||||
@@ -1667,7 +1667,7 @@ static int __xipram do_erase_oneblock(st
|
@@ -1656,7 +1656,7 @@ static int __xipram do_erase_oneblock(st
|
||||||
chip->erase_suspended = 0;
|
chip->erase_suspended = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
@@ -575,7 +575,7 @@ static void ag71xx_oom_timer_handler(uns
|
@@ -589,7 +589,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)
|
||||||
@@ -731,7 +731,7 @@ static int ag71xx_poll(struct napi_struc
|
@@ -745,7 +745,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);
|
||||||
@@ -750,7 +750,7 @@ static int ag71xx_poll(struct napi_struc
|
@@ -764,7 +764,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -780,7 +780,7 @@ static irqreturn_t ag71xx_interrupt(int
|
@@ -794,7 +794,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);
|
||||||
|
|
|
@ -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
|
||||||
@@ -575,7 +575,7 @@ static void ag71xx_oom_timer_handler(uns
|
@@ -589,7 +589,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)
|
||||||
@@ -731,7 +731,7 @@ static int ag71xx_poll(struct napi_struc
|
@@ -745,7 +745,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);
|
||||||
@@ -750,7 +750,7 @@ static int ag71xx_poll(struct napi_struc
|
@@ -764,7 +764,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -780,7 +780,7 @@ static irqreturn_t ag71xx_interrupt(int
|
@@ -794,7 +794,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);
|
||||||
|
|
|
@ -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
|
||||||
@@ -791,6 +791,18 @@ static void ag71xx_set_multicast_list(st
|
@@ -805,6 +805,18 @@ static void ag71xx_set_multicast_list(st
|
||||||
/* TODO */
|
/* TODO */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
@@ -790,6 +790,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,
|
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;
|
||||||
@@ -803,7 +805,10 @@ void __init ar71xx_add_device_dsa(unsign
|
@@ -835,7 +837,10 @@ void __init ar71xx_add_device_dsa(unsign
|
||||||
id);
|
id);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue