domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: update 3.10 to 3.10.12

Browse Source 
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38000
This commit is contained in:
Gabor Juhos
2013-09-15 16:00:41 +00:00
parent 57c6730ed6
commit 554772a665
39 changed files with 64 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch
View File

@@ -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 {