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: upgrade to 3.18.71
[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
9310b50
..
8da26fd
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
@@
-210,7
+210,7
@@
#include <linux/uaccess.h>
#include <linux/ipv6.h>
#include <linux/icmpv6.h>
#include <linux/uaccess.h>
#include <linux/ipv6.h>
#include <linux/icmpv6.h>
-@@ -8
37,10 +838
,10 @@ static void tcp_v6_send_response(struct
+@@ -8
44,10 +845
,10 @@ static void tcp_v6_send_response(struct
topt = (__be32 *)(t1 + 1);
if (tsecr) {
topt = (__be32 *)(t1 + 1);
if (tsecr) {
@@
-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
86,7 +386
,7 @@ int ipv6_recv_error(struct sock *sk, str
+@@ -3
90,7 +390
,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;
}
-@@ -72
0,12 +720
,12 @@ int ip6_datagram_send_ctl(struct net *ne
+@@ -72
4,12 +724
,12 @@ int ip6_datagram_send_ctl(struct net *ne
}
if (fl6->flowlabel&IPV6_FLOWINFO_MASK) {
}
if (fl6->flowlabel&IPV6_FLOWINFO_MASK) {
@@
-263,7
+263,7
@@
case IPV6_2292HOPOPTS:
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
case IPV6_2292HOPOPTS:
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
-@@ -47
6,11 +476
,11 @@ static int ip6gre_rcv(struct sk_buff *sk
+@@ -47
9,11 +479
,11 @@ static int ip6gre_rcv(struct sk_buff *sk
offset += 4;
}
if (flags&GRE_KEY) {
offset += 4;
}
if (flags&GRE_KEY) {
@@
-277,7
+277,7
@@
offset += 4;
}
}
offset += 4;
}
}
-@@ -74
5,7 +745
,7 @@ static netdev_tx_t ip6gre_xmit2(struct s
+@@ -74
8,7 +748
,7 @@ static netdev_tx_t ip6gre_xmit2(struct s
if (tunnel->parms.o_flags&GRE_SEQ) {
++tunnel->o_seqno;
if (tunnel->parms.o_flags&GRE_SEQ) {
++tunnel->o_seqno;
@@
-286,7
+286,7
@@
ptr--;
}
if (tunnel->parms.o_flags&GRE_KEY) {
ptr--;
}
if (tunnel->parms.o_flags&GRE_KEY) {
-@@ -84
1,7 +841
,7 @@ static inline int ip6gre_xmit_ipv6(struc
+@@ -84
4,7 +844
,7 @@ static inline int ip6gre_xmit_ipv6(struc
dsfield = ipv6_get_dsfield(ipv6h);
if (t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS)
dsfield = ipv6_get_dsfield(ipv6h);
if (t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS)
@@
-297,7
+297,7
@@
if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
-@@ -1
291,7 +129
1,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
+@@ -1
301,7 +130
1,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
dsfield = ipv6_get_dsfield(ipv6h);
if (t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS)
dsfield = ipv6_get_dsfield(ipv6h);
if (t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS)
@@
-606,7
+606,7
@@
goto next_ht;
--- a/net/ipv6/ip6_offload.c
+++ b/net/ipv6/ip6_offload.c
goto next_ht;
--- a/net/ipv6/ip6_offload.c
+++ b/net/ipv6/ip6_offload.c
-@@ -22
1,7 +221
,7 @@ static struct sk_buff **ipv6_gro_receive
+@@ -22
4,7 +224
,7 @@ static struct sk_buff **ipv6_gro_receive
continue;
iph2 = (struct ipv6hdr *)(p->data + off);
continue;
iph2 = (struct ipv6hdr *)(p->data + off);
@@
-617,7
+617,7
@@
* XXX skbs on the gro_list have all been parsed and pulled
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
* XXX skbs on the gro_list have all been parsed and pulled
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
-@@ -4
3,7 +43
,7 @@ struct prefix_info {
+@@ -4
5,7 +45
,7 @@ struct prefix_info {
__be32 reserved2;
struct in6_addr prefix;
__be32 reserved2;
struct in6_addr prefix;
@@
-831,7
+831,7
@@
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
-@@ -368
3,14 +3683
,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -368
2,14 +3682
,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);
{
const __be32 *ptr = (const __be32 *)(th + 1);