From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 7 Nov 2015 16:22:38 +0000 (+0000)
Subject: ar71xx: fix alignment of struct arpt_arp (fixes #14577)
X-Git-Tag: reboot~1609
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9dd5c79c473c9ddef1e747edf974da404b3f6a1d;p=openwrt%2Fstaging%2Fblogic.git

ar71xx: fix alignment of struct arpt_arp (fixes #14577)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 47416
---

diff --git a/target/linux/ar71xx/patches-4.1/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.1/910-unaligned_access_hacks.patch
index d98695f2515e..772b4eca11e2 100644
--- a/target/linux/ar71xx/patches-4.1/910-unaligned_access_hacks.patch
+++ b/target/linux/ar71xx/patches-4.1/910-unaligned_access_hacks.patch
@@ -891,3 +891,14 @@
  }
  
  static inline struct neighbour *___neigh_lookup_noref(
+--- a/include/uapi/linux/netfilter_arp/arp_tables.h
++++ b/include/uapi/linux/netfilter_arp/arp_tables.h
+@@ -68,7 +68,7 @@ struct arpt_arp {
+ 	__u8 flags;
+ 	/* Inverse flags */
+ 	__u16 invflags;
+-};
++} __attribute__((aligned(4));
+ 
+ /* Values for "flag" field in struct arpt_ip (general arp structure).
+  * No flags defined yet.