aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-01-13 16:48:23 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-01-13 16:48:23 +0000
commit1474359bd3426864a7d844c39b8f2dedf26c2119 (patch)
tree263a4fc3fccafc735b4868804c3ba29dd194c7a9 /target/linux
parentcec8ed1882565a9595020e63f52425d15832e612 (diff)
downloadupstream-1474359bd3426864a7d844c39b8f2dedf26c2119.tar.gz
upstream-1474359bd3426864a7d844c39b8f2dedf26c2119.tar.bz2
upstream-1474359bd3426864a7d844c39b8f2dedf26c2119.zip
ar71xx: fix unaligned access in cls_u32
SVN-Revision: 35132
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ar71xx/patches-3.7/902-unaligned_access_hacks.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/target/linux/ar71xx/patches-3.7/902-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-3.7/902-unaligned_access_hacks.patch
index 8806d866aa..fc05676b83 100644
--- a/target/linux/ar71xx/patches-3.7/902-unaligned_access_hacks.patch
+++ b/target/linux/ar71xx/patches-3.7/902-unaligned_access_hacks.patch
@@ -763,3 +763,25 @@
}
static inline struct neighbour *__ipv6_neigh_lookup(struct neigh_table *tbl, struct net_device *dev, const void *pkey)
+--- a/net/sched/cls_u32.c
++++ b/net/sched/cls_u32.c
+@@ -142,7 +142,7 @@ next_knode:
+ data = skb_header_pointer(skb, toff, 4, &hdata);
+ if (!data)
+ goto out;
+- if ((*data ^ key->val) & key->mask) {
++ if ((net_hdr_word(data) ^ key->val) & key->mask) {
+ n = n->next;
+ goto next_knode;
+ }
+@@ -193,8 +193,8 @@ check_terminal:
+ &hdata);
+ if (!data)
+ goto out;
+- sel = ht->divisor & u32_hash_fold(*data, &n->sel,
+- n->fshift);
++ sel = ht->divisor & u32_hash_fold(net_hdr_word(data),
++ &n->sel, n->fshift);
+ }
+ if (!(n->sel.flags & (TC_U32_VAROFFSET | TC_U32_OFFSET | TC_U32_EAT)))
+ goto next_ht;