diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-11-05 08:25:45 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-11-05 08:25:45 +0000 |
| commit | 35656042f1cd457819a75c980613634b494a7e70 (patch) | |
| tree | f7999960f435d3eeacf3bc222cf249f3df368969 /target/linux/ar71xx | |
| parent | cb07269988cd3be7cbbd3278081c5688ae8d7616 (diff) | |
| download | upstream-35656042f1cd457819a75c980613634b494a7e70.tar.gz upstream-35656042f1cd457819a75c980613634b494a7e70.tar.bz2 upstream-35656042f1cd457819a75c980613634b494a7e70.zip | |
kernel: update 3.10 to 3.10.18
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38652
Diffstat (limited to 'target/linux/ar71xx')
| -rw-r--r-- | target/linux/ar71xx/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index 8c7a1d6530..2491bc6308 100644 --- a/target/linux/ar71xx/Makefile +++ b/target/linux/ar71xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=mips16 CPU_TYPE=34kc SUBTARGETS:=generic nand mikrotik -LINUX_VERSION:=3.10.17 +LINUX_VERSION:=3.10.18 include $(INCLUDE_DIR)/target.mk 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 ce55abdf50..1807dfb2ed 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 @@ -775,7 +775,7 @@ #define IP_TTL 2 --- a/net/core/secure_seq.c +++ b/net/core/secure_seq.c -@@ -54,11 +54,12 @@ __u32 secure_tcpv6_sequence_number(const +@@ -56,11 +56,12 @@ __u32 secure_tcpv6_sequence_number(const u32 secret[MD5_MESSAGE_BYTES / 4]; u32 hash[MD5_DIGEST_WORDS]; u32 i; @@ -789,7 +789,7 @@ secret[4] = net_secret[4] + (((__force u16)sport << 16) + (__force u16)dport); for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++) -@@ -76,11 +77,12 @@ u32 secure_ipv6_port_ephemeral(const __b +@@ -78,11 +79,12 @@ u32 secure_ipv6_port_ephemeral(const __b u32 secret[MD5_MESSAGE_BYTES / 4]; u32 hash[MD5_DIGEST_WORDS]; u32 i; @@ -803,7 +803,7 @@ secret[4] = net_secret[4] + (__force u32)dport; for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++) secret[i] = net_secret[i]; -@@ -183,11 +185,12 @@ u64 secure_dccpv6_sequence_number(__be32 +@@ -185,11 +187,12 @@ u64 secure_dccpv6_sequence_number(__be32 u32 hash[MD5_DIGEST_WORDS]; u64 seq; u32 i; @@ -886,7 +886,7 @@ tpi->seq = 0; --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -3592,14 +3592,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -3625,14 +3625,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); |