summaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-22 16:04:25 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-22 16:04:25 +0000
commit13a779d3f3a91f0f029990ac96a7607aa24f6fe6 (patch)
tree0a98f37422ee96220e985cc94a509bf6df8ff3fe /target/linux/generic
parent4e88a660b0fa24feeed88fcd42b148f0b4aa21e3 (diff)
kernel: update to linux-3.0 and refresh patches.
Thank you Peter Wagner for the patch git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27722 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.0/020-ssb_update.patch8
-rw-r--r--target/linux/generic/patches-3.0/650-pppoe_header_pad.patch4
-rw-r--r--target/linux/generic/patches-3.0/721-phy_packets.patch2
-rw-r--r--target/linux/generic/patches-3.0/950-vm_exports.patch2
-rw-r--r--target/linux/generic/patches-3.0/999-drop_sublevel.patch2
5 files changed, 10 insertions, 8 deletions
diff --git a/target/linux/generic/patches-3.0/020-ssb_update.patch b/target/linux/generic/patches-3.0/020-ssb_update.patch
index a310d90f9..817c4f4dd 100644
--- a/target/linux/generic/patches-3.0/020-ssb_update.patch
+++ b/target/linux/generic/patches-3.0/020-ssb_update.patch
@@ -77,15 +77,17 @@
{
u16 tmp = pcicore_read16(pc, SSB_PCICORE_SPROM(0));
if (((tmp & 0xF000) >> 12) != pc->dev->core_index) {
-@@ -514,13 +514,13 @@ static void ssb_pcicore_pcie_setup_worka
+@@ -514,7 +514,7 @@ static void ssb_pcicore_pcie_setup_worka
* Generic and Clientmode operation code.
**************************************************/
-static void ssb_pcicore_init_clientmode(struct ssb_pcicore *pc)
+static void __devinit ssb_pcicore_init_clientmode(struct ssb_pcicore *pc)
{
- /* Disable PCI interrupts. */
- ssb_write32(pc->dev, SSB_INTVEC, 0);
+ ssb_pcicore_fix_sprom_core_index(pc);
+
+@@ -529,7 +529,7 @@ static void ssb_pcicore_init_clientmode(
+ }
}
-void ssb_pcicore_init(struct ssb_pcicore *pc)
diff --git a/target/linux/generic/patches-3.0/650-pppoe_header_pad.patch b/target/linux/generic/patches-3.0/650-pppoe_header_pad.patch
index 4875d5f23..147b28366 100644
--- a/target/linux/generic/patches-3.0/650-pppoe_header_pad.patch
+++ b/target/linux/generic/patches-3.0/650-pppoe_header_pad.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
-@@ -855,7 +855,7 @@ static int pppoe_sendmsg(struct kiocb *i
+@@ -856,7 +856,7 @@ static int pppoe_sendmsg(struct kiocb *i
goto end;
@@ -9,7 +9,7 @@
0, GFP_KERNEL);
if (!skb) {
error = -ENOMEM;
-@@ -863,7 +863,7 @@ static int pppoe_sendmsg(struct kiocb *i
+@@ -864,7 +864,7 @@ static int pppoe_sendmsg(struct kiocb *i
}
/* Reserve space for headers. */
diff --git a/target/linux/generic/patches-3.0/721-phy_packets.patch b/target/linux/generic/patches-3.0/721-phy_packets.patch
index ab86bbea3..988212edb 100644
--- a/target/linux/generic/patches-3.0/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.0/721-phy_packets.patch
@@ -53,7 +53,7 @@
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -1194,6 +1194,7 @@ struct net_device {
+@@ -1188,6 +1188,7 @@ struct net_device {
void *ax25_ptr; /* AX.25 specific data */
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
assign before registering */
diff --git a/target/linux/generic/patches-3.0/950-vm_exports.patch b/target/linux/generic/patches-3.0/950-vm_exports.patch
index b9e6f4088..a37be04e1 100644
--- a/target/linux/generic/patches-3.0/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.0/950-vm_exports.patch
@@ -61,7 +61,7 @@
{
--- a/kernel/sched.c
+++ b/kernel/sched.c
-@@ -4905,6 +4905,7 @@ int can_nice(const struct task_struct *p
+@@ -4937,6 +4937,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}
diff --git a/target/linux/generic/patches-3.0/999-drop_sublevel.patch b/target/linux/generic/patches-3.0/999-drop_sublevel.patch
index f85fc861f..ed938e0d9 100644
--- a/target/linux/generic/patches-3.0/999-drop_sublevel.patch
+++ b/target/linux/generic/patches-3.0/999-drop_sublevel.patch
@@ -4,6 +4,6 @@
VERSION = 3
PATCHLEVEL = 0
-SUBLEVEL = 0
- EXTRAVERSION = -rc7
+ EXTRAVERSION =
NAME = Sneaky Weasel