aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-12-09 09:38:33 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-12-09 09:38:33 +0000
commitffadf07c00574431744208b71ba1219f698c14c5 (patch)
treed03f07c719b013c21f1e95e52bd6db510d3e6107 /target/linux
parent5469e95efe7351a6d041af47b31428fc68f0586b (diff)
downloadupstream-ffadf07c00574431744208b71ba1219f698c14c5.tar.gz
upstream-ffadf07c00574431744208b71ba1219f698c14c5.tar.bz2
upstream-ffadf07c00574431744208b71ba1219f698c14c5.zip
ar71xx: remove another leftover broken chunk of code in the unaligned access hacks patch
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43586 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ar71xx/patches-3.14/902-unaligned_access_hacks.patch24
1 files changed, 0 insertions, 24 deletions
diff --git a/target/linux/ar71xx/patches-3.14/902-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-3.14/902-unaligned_access_hacks.patch
index 86fe6c0369..c4d0005d69 100644
--- a/target/linux/ar71xx/patches-3.14/902-unaligned_access_hacks.patch
+++ b/target/linux/ar71xx/patches-3.14/902-unaligned_access_hacks.patch
@@ -200,30 +200,6 @@
#endif /* __UAPI_DEF_IN6_ADDR */
#if __UAPI_DEF_SOCKADDR_IN6
---- a/net/ipv6/af_inet6.c
-+++ b/net/ipv6/af_inet6.c
-@@ -62,6 +62,7 @@
- #endif
-
- #include <asm/uaccess.h>
-+#include <asm/unaligned.h>
- #include <linux/mroute6.h>
-
- MODULE_AUTHOR("Cast of dozens");
-@@ -679,11 +680,12 @@ bool ipv6_opt_accepted(const struct sock
- {
- const struct ipv6_pinfo *np = inet6_sk(sk);
- const struct inet6_skb_parm *opt = IP6CB(skb);
-+ unsigned char *header = skb_network_header(skb);
-
- if (np->rxopt.all) {
- if ((opt->hop && (np->rxopt.bits.hopopts ||
- np->rxopt.bits.ohopopts)) ||
-- (ip6_flowinfo((struct ipv6hdr *) skb_network_header(skb)) &&
-+ (ip6_flowinfo((struct ipv6hdr *)net_hdr_word(header)) &&
- np->rxopt.bits.rxflow) ||
- (opt->srcrt && (np->rxopt.bits.srcrt ||
- np->rxopt.bits.osrcrt)) ||
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -65,6 +65,7 @@