projects
/
openwrt
/
staging
/
wigyori.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.4 to 4.4.110
[openwrt/staging/wigyori.git]
/
target
/
linux
/
ar71xx
/
patches-4.4
/
910-unaligned_access_hacks.patch
diff --git
a/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
b/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
index 7e3ba4c8d51ae5f7974c2acb3399739548f03ef1..8882b1758fed7ac254116fb0cb0e1b95bbe5259f 100644
(file)
--- a/
target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
+++ b/
target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
@@
-214,7
+214,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>
-@@ -78
1,10 +782
,10 @@ static void tcp_v6_send_response(const s
+@@ -78
6,10 +787
,10 @@ static void tcp_v6_send_response(const s
topt = (__be32 *)(t1 + 1);
if (tsecr) {
topt = (__be32 *)(t1 + 1);
if (tsecr) {
@@
-241,7
+241,7
@@
*/
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
*/
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
-@@ -4
29,7 +429
,7 @@ int ipv6_recv_error(struct sock *sk, str
+@@ -4
33,7 +433
,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 {
@@
-250,7
+250,7
@@
&sin->sin6_addr);
sin->sin6_scope_id = 0;
}
&sin->sin6_addr);
sin->sin6_scope_id = 0;
}
-@@ -7
66,12 +766
,12 @@ int ip6_datagram_send_ctl(struct net *ne
+@@ -7
70,12 +770
,12 @@ int ip6_datagram_send_ctl(struct net *ne
}
if (fl6->flowlabel&IPV6_FLOWINFO_MASK) {
}
if (fl6->flowlabel&IPV6_FLOWINFO_MASK) {
@@
-276,7
+276,7
@@
t = ip6gre_tunnel_lookup(skb->dev, &ipv6h->daddr, &ipv6h->saddr,
key, greh->protocol);
t = ip6gre_tunnel_lookup(skb->dev, &ipv6h->daddr, &ipv6h->saddr,
key, greh->protocol);
-@@ -4
79,11 +479
,11 @@ static int ip6gre_rcv(struct sk_buff *sk
+@@ -4
82,11 +482
,11 @@ static int ip6gre_rcv(struct sk_buff *sk
offset += 4;
}
if (flags&GRE_KEY) {
offset += 4;
}
if (flags&GRE_KEY) {
@@
-290,7
+290,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;
@@
-299,7
+299,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)
@@
-491,7
+491,7
@@
memcpy(p, foc->val, foc->len);
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
memcpy(p, foc->val, foc->len);
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
-@@ -5
05,7 +505
,7 @@ static struct sk_buff *add_grec(struct s
+@@ -5
29,7 +529
,7 @@ static struct sk_buff *add_grec(struct s
if (!skb)
return NULL;
psrc = (__be32 *)skb_put(skb, sizeof(__be32));
if (!skb)
return NULL;
psrc = (__be32 *)skb_put(skb, sizeof(__be32));
@@
-610,7
+610,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
2,7 +222
,7 @@ static struct sk_buff **ipv6_gro_receive
+@@ -22
5,7 +225
,7 @@ static struct sk_buff **ipv6_gro_receive
continue;
iph2 = (struct ipv6hdr *)(p->data + off);
continue;
iph2 = (struct ipv6hdr *)(p->data + off);
@@
-711,7
+711,7
@@
if (xb)
return i * 32 + 31 - __fls(ntohl(xb));
}
if (xb)
return i * 32 + 31 - __fls(ntohl(xb));
}
-@@ -
799,17 +803
,18 @@ static inline int ip6_default_np_autolab
+@@ -
804,17 +808
,18 @@ static inline int ip6_default_np_autolab
static inline void ip6_flow_hdr(struct ipv6hdr *hdr, unsigned int tclass,
__be32 flowlabel)
{
static inline void ip6_flow_hdr(struct ipv6hdr *hdr, unsigned int tclass,
__be32 flowlabel)
{