aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-07-03 16:47:44 +0000
committerJonas Gorski <jogo@openwrt.org>2015-07-03 16:47:44 +0000
commit7e2450f03cf80d0cfcb66f4d2f242c2766aa773b (patch)
treef9b4932a0015a1349adbdc86c5bff95630c2051e
parent27b9bf44938a16e4a0f2764b0017a480bb473db4 (diff)
downloadupstream-7e2450f03cf80d0cfcb66f4d2f242c2766aa773b.tar.gz
upstream-7e2450f03cf80d0cfcb66f4d2f242c2766aa773b.tar.bz2
upstream-7e2450f03cf80d0cfcb66f4d2f242c2766aa773b.zip
ar71xx: make 902-unaligned_access_hacks.patch apply again
r46161 updated headers also touched by it, so it needed to be refreshed as well. Closes #20033. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46165
-rw-r--r--target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch
index 7e22859343..2e921a22f5 100644
--- a/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch
+++ b/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch
@@ -745,15 +745,15 @@
u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
--- a/include/uapi/linux/in.h
+++ b/include/uapi/linux/in.h
-@@ -78,7 +78,7 @@ enum {
+@@ -81,7 +81,7 @@ enum {
/* Internet address. */
struct in_addr {
__be32 s_addr;
-};
+} __attribute__((packed, aligned(2)));
+ #endif
#define IP_TOS 1
- #define IP_TTL 2
--- a/net/core/secure_seq.c
+++ b/net/core/secure_seq.c
@@ -46,11 +46,12 @@ __u32 secure_tcpv6_sequence_number(const