summaryrefslogtreecommitdiff
path: root/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-07-20 17:31:15 +0000
committerJohn Crispin <john@openwrt.org>2014-07-20 17:31:15 +0000
commit2b48ee80f98647fd449fc8301670bb9a5d090f60 (patch)
treebb013e60dd7fb2e60bc2ebd0551deb7669bffe55 /target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch
parentba63338d3f8b791be2fb606f88bdec63a7aa7d53 (diff)
downloadmtk-20170518-2b48ee80f98647fd449fc8301670bb9a5d090f60.zip
mtk-20170518-2b48ee80f98647fd449fc8301670bb9a5d090f60.tar.gz
mtk-20170518-2b48ee80f98647fd449fc8301670bb9a5d090f60.tar.bz2
kernel: refresh 3.10 patches
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 41777
Diffstat (limited to 'target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch')
-rw-r--r--target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch4
1 files changed, 2 insertions, 2 deletions
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 17c6be7..121276a 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
@@ -328,7 +328,7 @@
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
-@@ -1272,9 +1272,9 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
+@@ -1273,9 +1273,9 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
dsfield = ipv6_get_dsfield(ipv6h);
if (t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS)
@@ -886,7 +886,7 @@
tpi->seq = 0;
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
-@@ -3625,14 +3625,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -3624,14 +3624,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);