diff options
| author | luka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-07-04 23:31:39 +0000 |
|---|---|---|
| committer | luka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-07-04 23:31:39 +0000 |
| commit | a5911b373980a77afd8548cd78193ac46d2332d0 (patch) | |
| tree | 30732f9cd778daf0f55fa582317cd9431c4879fe /target/linux/ar71xx/patches-3.8/902-unaligned_access_hacks.patch | |
| parent | 76abdb00d9a67d8c5e0d7438b67d93d7fffae896 (diff) | |
ar71xx: merge patches [611-*,621-*] into 610-*
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37176 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-3.8/902-unaligned_access_hacks.patch')
| -rw-r--r-- | target/linux/ar71xx/patches-3.8/902-unaligned_access_hacks.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ar71xx/patches-3.8/902-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-3.8/902-unaligned_access_hacks.patch index 9eb1324d26..400e766229 100644 --- a/target/linux/ar71xx/patches-3.8/902-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-3.8/902-unaligned_access_hacks.patch @@ -242,7 +242,7 @@ np->rxopt.bits.osrcrt)) || --- a/net/ipv6/route.c +++ b/net/ipv6/route.c -@@ -995,7 +995,7 @@ void ip6_route_input(struct sk_buff *skb +@@ -1013,7 +1013,7 @@ void ip6_route_input(struct sk_buff *skb .flowi6_iif = skb->dev->ifindex, .daddr = iph->daddr, .saddr = iph->saddr, @@ -251,7 +251,7 @@ .flowi6_mark = skb->mark, .flowi6_proto = iph->nexthdr, }; -@@ -1159,7 +1159,7 @@ void ip6_update_pmtu(struct sk_buff *skb +@@ -1177,7 +1177,7 @@ void ip6_update_pmtu(struct sk_buff *skb fl6.flowi6_flags = 0; fl6.daddr = iph->daddr; fl6.saddr = iph->saddr; @@ -260,7 +260,7 @@ dst = ip6_route_output(net, NULL, &fl6); if (!dst->error) -@@ -1187,7 +1187,7 @@ void ip6_redirect(struct sk_buff *skb, s +@@ -1205,7 +1205,7 @@ void ip6_redirect(struct sk_buff *skb, s fl6.flowi6_flags = 0; fl6.daddr = iph->daddr; fl6.saddr = iph->saddr; |