diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-09-15 16:00:41 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-09-15 16:00:41 +0000 |
| commit | 554772a66547afa10bc7fc3040f3bf9259728c60 (patch) | |
| tree | 0e13685d463ed4e6c63782bdfa6a4258ba154c99 /target/linux/ar71xx | |
| parent | 57c6730ed623e347ed8eae420e5e2fa6e67ebecc (diff) | |
| download | upstream-554772a66547afa10bc7fc3040f3bf9259728c60.tar.gz upstream-554772a66547afa10bc7fc3040f3bf9259728c60.tar.bz2 upstream-554772a66547afa10bc7fc3040f3bf9259728c60.zip | |
kernel: update 3.10 to 3.10.12
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38000
Diffstat (limited to 'target/linux/ar71xx')
4 files changed, 11 insertions, 9 deletions
diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index 20464f81a2..ba63ded1de 100644 --- a/target/linux/ar71xx/Makefile +++ b/target/linux/ar71xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs targz mips16 CFLAGS:=-Os -pipe -mips32r2 -mtune=34kc -mno-branch-likely SUBTARGETS:=generic nand -LINUX_VERSION:=3.10.10 +LINUX_VERSION:=3.10.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar71xx/patches-3.10/404-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-3.10/404-mtd-wrt160nl-trx-parser.patch index 6584c19e70..e55018ba7f 100644 --- a/target/linux/ar71xx/patches-3.10/404-mtd-wrt160nl-trx-parser.patch +++ b/target/linux/ar71xx/patches-3.10/404-mtd-wrt160nl-trx-parser.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig -@@ -172,6 +172,12 @@ config MTD_BCM47XX_PARTS +@@ -176,6 +176,12 @@ config MTD_BCM47XX_PARTS This provides partitions parser for devices based on BCM47xx boards. diff --git a/target/linux/ar71xx/patches-3.10/405-mtd-tp-link-partition-parser.patch b/target/linux/ar71xx/patches-3.10/405-mtd-tp-link-partition-parser.patch index 96fe34203c..f0d26b7434 100644 --- a/target/linux/ar71xx/patches-3.10/405-mtd-tp-link-partition-parser.patch +++ b/target/linux/ar71xx/patches-3.10/405-mtd-tp-link-partition-parser.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig -@@ -174,7 +174,7 @@ config MTD_BCM47XX_PARTS +@@ -178,7 +178,7 @@ config MTD_BCM47XX_PARTS config MTD_WRT160NL_PARTS tristate "Linksys WRT160NL partitioning support" @@ -9,7 +9,7 @@ ---help--- Linksys WRT160NL partitioning support -@@ -194,6 +194,12 @@ config MTD_MYLOADER_PARTS +@@ -198,6 +198,12 @@ config MTD_MYLOADER_PARTS You will still need the parsing functions to be called by the driver for your particular device. It won't happen automatically. diff --git a/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch index 2e07b14ca1..fa4ff47d3c 100644 --- a/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch @@ -883,7 +883,7 @@ tpi->seq = 0; --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -3592,13 +3592,14 @@ static bool tcp_parse_aligned_timestamp( +@@ -3592,14 +3592,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); @@ -897,11 +897,13 @@ - tp->rx_opt.rcv_tsval = ntohl(*ptr); + tp->rx_opt.rcv_tsval = get_unaligned_be32(ptr); ++ptr; -- tp->rx_opt.rcv_tsecr = ntohl(*ptr) - tp->tsoffset; -+ tp->rx_opt.rcv_tsecr = get_unaligned_be32(ptr) - tp->tsoffset; + if (*ptr) +- tp->rx_opt.rcv_tsecr = ntohl(*ptr) - tp->tsoffset; ++ tp->rx_opt.rcv_tsecr = get_unaligned_be32(ptr) - ++ tp->tsoffset; + else + tp->rx_opt.rcv_tsecr = 0; return true; - } - return false; --- a/include/uapi/linux/if_pppox.h +++ b/include/uapi/linux/if_pppox.h @@ -47,6 +47,7 @@ struct pppoe_addr { |