projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.9 to 4.9.116
[openwrt/openwrt.git]
/
target
/
linux
/
ar71xx
/
patches-4.9
/
910-unaligned_access_hacks.patch
diff --git
a/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
b/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
index 1815ccb1d3181915c7b4f77358cb2031edb9748d..54a41b6e3affc6e5e0365e53c3a35ea9598f22d1 100644
(file)
--- a/
target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
+++ b/
target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
@@
-250,7
+250,7
@@
&sin->sin6_addr);
sin->sin6_scope_id = 0;
}
&sin->sin6_addr);
sin->sin6_scope_id = 0;
}
-@@ -81
4,12 +814
,12 @@ int ip6_datagram_send_ctl(struct net *ne
+@@ -81
7,12 +817
,12 @@ int ip6_datagram_send_ctl(struct net *ne
}
if (fl6->flowlabel&IPV6_FLOWINFO_MASK) {
}
if (fl6->flowlabel&IPV6_FLOWINFO_MASK) {
@@
-327,7
+327,7
@@
return neigh_create(&arp_tbl, pkey, dev);
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
return neigh_create(&arp_tbl, pkey, dev);
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
-@@ -4
48,48 +448
,53 @@ static void tcp_options_write(__be32 *pt
+@@ -4
53,48 +453
,53 @@ static void tcp_options_write(__be32 *pt
u16 options = opts->options; /* mungable copy */
if (unlikely(OPTION_MD5 & options)) {
u16 options = opts->options; /* mungable copy */
if (unlikely(OPTION_MD5 & options)) {
@@
-404,7
+404,7
@@
}
if (unlikely(opts->num_sack_blocks)) {
}
if (unlikely(opts->num_sack_blocks)) {
-@@ -
497,16 +502
,17 @@ static void tcp_options_write(__be32 *pt
+@@ -
502,16 +507
,17 @@ static void tcp_options_write(__be32 *pt
tp->duplicate_sack : tp->selective_acks;
int this_sack;
tp->duplicate_sack : tp->selective_acks;
int this_sack;
@@
-428,7
+428,7
@@
}
tp->rx_opt.dsack = 0;
}
tp->rx_opt.dsack = 0;
-@@ -5
19,13 +525
,14 @@ static void tcp_options_write(__be32 *pt
+@@ -5
24,13 +530
,14 @@ static void tcp_options_write(__be32 *pt
if (foc->exp) {
len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len;
if (foc->exp) {
len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len;
@@
-795,7
+795,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
-@@ -3
896,14 +389
6,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -3
906,14 +390
6,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);
{
const __be32 *ptr = (const __be32 *)(th + 1);