projects
/
15.05
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CC: kernel: update kernel 3.18 to version 3.18.23
[15.05/openwrt.git]
/
target
/
linux
/
ar71xx
/
patches-3.18
/
902-unaligned_access_hacks.patch
diff --git
a/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch
b/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch
index
21fdd67
..
3a9ca14
100644
(file)
--- a/
target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch
+++ b/
target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch
@@
-237,7
+237,7
@@
*/
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
*/
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
-@@ -3
74,7 +37
4,7 @@ int ipv6_recv_error(struct sock *sk, str
+@@ -3
84,7 +38
4,7 @@ int ipv6_recv_error(struct sock *sk, str
ipv6_iface_scope_id(&sin->sin6_addr,
IP6CB(skb)->iif);
} else {
ipv6_iface_scope_id(&sin->sin6_addr,
IP6CB(skb)->iif);
} else {
@@
-246,7
+246,7
@@
&sin->sin6_addr);
sin->sin6_scope_id = 0;
}
&sin->sin6_addr);
sin->sin6_scope_id = 0;
}
-@@ -7
08,12 +70
8,12 @@ int ip6_datagram_send_ctl(struct net *ne
+@@ -7
18,12 +71
8,12 @@ int ip6_datagram_send_ctl(struct net *ne
}
if (fl6->flowlabel&IPV6_FLOWINFO_MASK) {
}
if (fl6->flowlabel&IPV6_FLOWINFO_MASK) {