aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
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
commita2ea218b39db68e06082bb99b0ae25ae80d075b6 (patch)
treee2f3a71f593b068f9dcdd166fffc3f5951c0a77d /target/linux
parent16c4d5a4758d9d6cad8350776d7d848f3c91e727 (diff)
downloadmaster-187ad058-a2ea218b39db68e06082bb99b0ae25ae80d075b6.tar.gz
master-187ad058-a2ea218b39db68e06082bb99b0ae25ae80d075b6.tar.bz2
master-187ad058-a2ea218b39db68e06082bb99b0ae25ae80d075b6.zip
ar71xx: add missing patch chunk to 4.1 unaligned access hacks
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46431 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-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(