|
@@ -349,7 +349,7 @@ SVN-Revision: 35130
|
|
|
list_for_each_entry(p, head, list) {
|
|
|
--- a/net/ipv4/tcp_output.c
|
|
|
+++ b/net/ipv4/tcp_output.c
|
|
|
-@@ -610,48 +610,53 @@ static void tcp_options_write(__be32 *pt
|
|
|
+@@ -609,48 +609,53 @@ static void tcp_options_write(__be32 *pt
|
|
|
u16 options = opts->options; /* mungable copy */
|
|
|
|
|
|
if (unlikely(OPTION_MD5 & options)) {
|
|
@@ -426,7 +426,7 @@ SVN-Revision: 35130
|
|
|
}
|
|
|
|
|
|
if (unlikely(opts->num_sack_blocks)) {
|
|
|
-@@ -659,16 +664,17 @@ static void tcp_options_write(__be32 *pt
|
|
|
+@@ -658,16 +663,17 @@ static void tcp_options_write(__be32 *pt
|
|
|
tp->duplicate_sack : tp->selective_acks;
|
|
|
int this_sack;
|
|
|
|
|
@@ -450,7 +450,7 @@ SVN-Revision: 35130
|
|
|
}
|
|
|
|
|
|
tp->rx_opt.dsack = 0;
|
|
|
-@@ -681,13 +687,14 @@ static void tcp_options_write(__be32 *pt
|
|
|
+@@ -680,13 +686,14 @@ static void tcp_options_write(__be32 *pt
|
|
|
|
|
|
if (foc->exp) {
|
|
|
len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len;
|
|
@@ -750,7 +750,7 @@ SVN-Revision: 35130
|
|
|
EXPORT_SYMBOL(xfrm_parse_spi);
|
|
|
--- a/net/ipv4/tcp_input.c
|
|
|
+++ b/net/ipv4/tcp_input.c
|
|
|
-@@ -4157,14 +4157,16 @@ static bool tcp_parse_aligned_timestamp(
|
|
|
+@@ -4170,14 +4170,16 @@ static bool tcp_parse_aligned_timestamp(
|
|
|
{
|
|
|
const __be32 *ptr = (const __be32 *)(th + 1);
|
|
|
|