aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2018-10-20 12:18:03 +0200
committerJo-Philipp Wich <jo@mein.io>2019-01-30 12:49:36 +0100
commit19850b639e445b6c13e8fa47cf9745fa617f53eb (patch)
tree5f3cea398bb6f9df25b3f45b304655cef0dcd484
parentda5bee5345ce8f66eb36b8993b87b684e5cce614 (diff)
downloadupstream-19850b639e445b6c13e8fa47cf9745fa617f53eb.tar.gz
upstream-19850b639e445b6c13e8fa47cf9745fa617f53eb.tar.bz2
upstream-19850b639e445b6c13e8fa47cf9745fa617f53eb.zip
ar71xx: fix packed-not-aligned error with GCC 8.
Building ar71xx currently fails with: In file included from ./include/linux/ipv6.h:5, from ./include/net/ipv6.h:16, from ./include/net/inetpeer.h:16, from ./include/net/ip_fib.h:24, from ./include/net/switchdev.h:17, from ./include/net/dsa.h:23, from arch/mips/ath79/dev-dsa.h:15, from arch/mips/ath79/dev-dsa.c:17: ./include/uapi/linux/ipv6.h:107:1: error: alignment 1 of 'struct ipv6_destopt_hao' is less than 2 [-Werror=packed-not-aligned] } __attribute__((packed)); Address this issue by correcting the alignment of the struct packing pragma accordingly. Fixes: FS#1805 Reported-by: Pascal Ernster <git@hardfalcon.net> [reword subject, rewrap commit message] Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-rw-r--r--target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch9
1 files changed, 9 insertions, 0 deletions
diff --git a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch
index c642176d1e..99624f07c1 100644
--- a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch
+++ b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch
@@ -129,6 +129,15 @@
struct ip_auth_hdr {
--- a/include/uapi/linux/ipv6.h
+++ b/include/uapi/linux/ipv6.h
+@@ -104,7 +104,7 @@ struct ipv6_destopt_hao {
+ __u8 type;
+ __u8 length;
+ struct in6_addr addr;
+-} __attribute__((packed));
++} __attribute__((packed, aligned(2)));
+
+ /*
+ * IPv6 fixed header
@@ -131,7 +131,7 @@ struct ipv6hdr {
struct in6_addr saddr;