projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update 3.10 to 3.10.2
[openwrt.git]
/
target
/
linux
/
ar71xx
/
patches-3.10
/
902-unaligned_access_hacks.patch
diff --git
a/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch
b/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch
index
0b89df2
..
2e07b14
100644
(file)
--- a/
target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch
+++ b/
target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch
@@
-229,7
+229,7
@@
#include <asm/uaccess.h>
#include <linux/proc_fs.h>
#include <asm/uaccess.h>
#include <linux/proc_fs.h>
-@@ -763,10 +764,10 @@ static void tcp_v6_send_response(struct
+@@ -763,10 +764,10 @@ static void tcp_v6_send_response(struct
topt = (__be32 *)(t1 + 1);
if (tsecr) {
topt = (__be32 *)(t1 + 1);
if (tsecr) {
@@
-662,7
+662,7
@@
#include <linux/netdevice.h>
--- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h
#include <linux/netdevice.h>
--- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h
-@@ -115,13 +115,13 @@ static inline int IP6_ECN_set_ce(struct
+@@ -115,13 +115,13 @@ static inline int IP6_ECN_set_ce(struct
{
if (INET_ECN_is_not_ect(ipv6_get_dsfield(iph)))
return 0;
{
if (INET_ECN_is_not_ect(ipv6_get_dsfield(iph)))
return 0;
@@
-852,7
+852,7
@@
ptr = ip6hoff + sizeof(struct ipv6hdr);
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
ptr = ip6hoff + sizeof(struct ipv6hdr);
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
-@@ -77,8 +77,8 @@ int xfrm_parse_spi(struct sk_buff *skb,
+@@ -77,8 +77,8 @@ int xfrm_parse_spi(struct sk_buff *skb,
if (!pskb_may_pull(skb, hlen))
return -EINVAL;
if (!pskb_may_pull(skb, hlen))
return -EINVAL;