projects
/
oweals
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6cb0409
)
ar71xx: refresh 2.6.31 patches
author
Gabor Juhos
<juhosg@openwrt.org>
Thu, 3 Dec 2009 14:17:07 +0000
(14:17 +0000)
committer
Gabor Juhos
<juhosg@openwrt.org>
Thu, 3 Dec 2009 14:17:07 +0000
(14:17 +0000)
SVN-Revision: 18618
target/linux/ar71xx/patches-2.6.31/108-mtd_fix_cfi_cmdset_0002_erase_status_check.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-2.6.31/800-ag71xx-remove-netdev-arg-from-napi-calls.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-2.6.31/801-ag71xx-remove-redundant-napi-functions.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-2.6.31/802-ag71xx-use-netdev-ops.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-2.6.31/803-ar71xx-update-dsa-switch-support.patch
patch
|
blob
|
history
diff --git
a/target/linux/ar71xx/patches-2.6.31/108-mtd_fix_cfi_cmdset_0002_erase_status_check.patch
b/target/linux/ar71xx/patches-2.6.31/108-mtd_fix_cfi_cmdset_0002_erase_status_check.patch
index 3f25b61dd9f846b11a4b62a8406c5c847aca3476..22aefe0d46b15d28a9f2e03dcd976f84b9e3712c 100644
(file)
--- a/
target/linux/ar71xx/patches-2.6.31/108-mtd_fix_cfi_cmdset_0002_erase_status_check.patch
+++ b/
target/linux/ar71xx/patches-2.6.31/108-mtd_fix_cfi_cmdset_0002_erase_status_check.patch
@@
-1,6
+1,6
@@
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -15
79,7 +1579
,7 @@ static int __xipram do_erase_chip(struct
+@@ -15
68,7 +1568
,7 @@ static int __xipram do_erase_chip(struct
chip->erase_suspended = 0;
}
chip->erase_suspended = 0;
}
@@
-9,7
+9,7
@@
break;
if (time_after(jiffies, timeo)) {
break;
if (time_after(jiffies, timeo)) {
-@@ -16
67,7 +1667
,7 @@ static int __xipram do_erase_oneblock(st
+@@ -16
56,7 +1656
,7 @@ static int __xipram do_erase_oneblock(st
chip->erase_suspended = 0;
}
chip->erase_suspended = 0;
}
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 aca39a431640e91f036af9b8ada46f97c3e45ca8..982e68d8be3520c4c390619647b983c1d1cec7b3 100644
(file)
--- 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
--- a/drivers/net/ag71xx/ag71xx_main.c
+++ b/drivers/net/ag71xx/ag71xx_main.c
-@@ -5
75,7 +575
,7 @@ static void ag71xx_oom_timer_handler(uns
+@@ -5
89,7 +589
,7 @@ static void ag71xx_oom_timer_handler(uns
struct net_device *dev = (struct net_device *) data;
struct ag71xx *ag = netdev_priv(dev);
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)
}
static void ag71xx_tx_timeout(struct net_device *dev)
-@@ -7
31,7 +731
,7 @@ static int ag71xx_poll(struct napi_struc
+@@ -7
45,7 +745
,7 @@ static int ag71xx_poll(struct napi_struc
DBG("%s: disable polling mode, done=%d, limit=%d\n",
dev->name, done, limit);
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);
/* enable interrupts */
spin_lock_irqsave(&ag->lock, flags);
-@@ -7
50,7 +750
,7 @@ static int ag71xx_poll(struct napi_struc
+@@ -7
64,7 +764
,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);
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;
}
return 0;
}
-@@ -7
80,7 +780
,7 @@ static irqreturn_t ag71xx_interrupt(int
+@@ -7
94,7 +794
,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);
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 65a02bc12024a3d5bf21051cbed731693a0036be..7c6996e1b9482c0e6878a45aa1e2b88f4eaaed5c 100644
(file)
--- 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
--- a/drivers/net/ag71xx/ag71xx_main.c
+++ b/drivers/net/ag71xx/ag71xx_main.c
-@@ -5
75,7 +575
,7 @@ static void ag71xx_oom_timer_handler(uns
+@@ -5
89,7 +589
,7 @@ static void ag71xx_oom_timer_handler(uns
struct net_device *dev = (struct net_device *) data;
struct ag71xx *ag = netdev_priv(dev);
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)
}
static void ag71xx_tx_timeout(struct net_device *dev)
-@@ -7
31,7 +731
,7 @@ static int ag71xx_poll(struct napi_struc
+@@ -7
45,7 +745
,7 @@ static int ag71xx_poll(struct napi_struc
DBG("%s: disable polling mode, done=%d, limit=%d\n",
dev->name, done, limit);
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);
/* enable interrupts */
spin_lock_irqsave(&ag->lock, flags);
-@@ -7
50,7 +750
,7 @@ static int ag71xx_poll(struct napi_struc
+@@ -7
64,7 +764
,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);
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;
}
return 0;
}
-@@ -7
80,7 +780
,7 @@ static irqreturn_t ag71xx_interrupt(int
+@@ -7
94,7 +794
,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);
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 a692b734aac3592229a1eb44132bebedbdccc03e..3067b49a49bf9aa39306cfeca77da3ee347624e1 100644
(file)
--- 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
--- 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
+@@ -
805,6 +805
,18 @@ static void ag71xx_set_multicast_list(st
/* TODO */
}
/* TODO */
}
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 03f9dd27f4b5ad9db50b00cbaa4c005e623430da..b78c5d41a4cae9772f98f4da7b2cfd4948d7125f 100644
(file)
--- 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
--- a/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,
struct dsa_platform_data *d)
{
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;
switch (id) {
case 0:
d->netdev = &ar71xx_eth0_device.dev;
-@@ -8
03,7 +805
,10 @@ void __init ar71xx_add_device_dsa(unsign
+@@ -8
35,7 +837
,10 @@ void __init ar71xx_add_device_dsa(unsign
id);
return;
}
id);
return;
}