aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-07-19 17:59:15 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-07-19 17:59:15 +0000
commit91791aea2ee829ad1b7c1f5be25831f1c0edf525 (patch)
treed15a2071ee933cbd8041c7cb58db141992eca33b /target
parentb704d3c96e0b609e9fbf9f9b1999e74a88763e4f (diff)
downloadupstream-91791aea2ee829ad1b7c1f5be25831f1c0edf525.tar.gz
upstream-91791aea2ee829ad1b7c1f5be25831f1c0edf525.tar.bz2
upstream-91791aea2ee829ad1b7c1f5be25831f1c0edf525.zip
ar71xx: add missing patch chunk to 4.1 unaligned access hacks
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 46431
Diffstat (limited to 'target')
-rw-r--r--target/linux/ar71xx/patches-4.1/910-unaligned_access_hacks.patch15
1 files changed, 15 insertions, 0 deletions
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 fbbe22e33b..05f6465f37 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
@@ -876,3 +876,18 @@
fragment = 0;
ptr = ip6hoff + sizeof(struct ipv6hdr);
+--- a/include/net/neighbour.h
++++ b/include/net/neighbour.h
+@@ -262,8 +262,10 @@ static inline bool neigh_key_eq128(const
+ const u32 *n32 = (const u32 *)n->primary_key;
+ const u32 *p32 = pkey;
+
+- return ((n32[0] ^ p32[0]) | (n32[1] ^ p32[1]) |
+- (n32[2] ^ p32[2]) | (n32[3] ^ p32[3])) == 0;
++ return ((n32[0] ^ net_hdr_word(&p32[0])) |
++ (n32[1] ^ net_hdr_word(&p32[1])) |
++ (n32[2] ^ net_hdr_word(&p32[2])) |
++ (n32[3] ^ net_hdr_word(&p32[3]))) == 0;
+ }
+
+ static inline struct neighbour *___neigh_lookup_noref(