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.36
[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
d077b60
..
dc04769
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
@@
-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
-@@ -39
3,7 +393
,7 @@ static void ip6gre_err(struct sk_buff *s
+@@ -39
4,7 +394
,7 @@ static void ip6gre_err(struct sk_buff *s
t = ip6gre_tunnel_lookup(skb->dev, &ipv6h->daddr, &ipv6h->saddr,
flags & GRE_KEY ?
t = ip6gre_tunnel_lookup(skb->dev, &ipv6h->daddr, &ipv6h->saddr,
flags & GRE_KEY ?
@@
-272,7
+272,7
@@
p[1]);
if (t == NULL)
return;
p[1]);
if (t == NULL)
return;
-@@ -47
5,11 +475
,11 @@ static int ip6gre_rcv(struct sk_buff *sk
+@@ -47
6,11 +476
,11 @@ static int ip6gre_rcv(struct sk_buff *sk
offset += 4;
}
if (flags&GRE_KEY) {
offset += 4;
}
if (flags&GRE_KEY) {
@@
-286,7
+286,7
@@
offset += 4;
}
}
offset += 4;
}
}
-@@ -74
4,7 +744
,7 @@ static netdev_tx_t ip6gre_xmit2(struct s
+@@ -74
5,7 +745
,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;
@@
-295,7
+295,7
@@
ptr--;
}
if (tunnel->parms.o_flags&GRE_KEY) {
ptr--;
}
if (tunnel->parms.o_flags&GRE_KEY) {
-@@ -84
0,7 +840
,7 @@ static inline int ip6gre_xmit_ipv6(struc
+@@ -84
1,7 +841
,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)