diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 12:17:14 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 12:17:14 -0400 |
| commit | 3bf38e570e7b2835e089db29cfcc7be3a30a8b88 (patch) | |
| tree | 1e6d2a54e92ea05f53af487295763476b6bfd3a4 | |
| parent | 9d26cf00ade8878c2c72e287a615539c2a67d1d5 (diff) | |
| download | longterm-queue-4.12-3bf38e570e7b2835e089db29cfcc7be3a30a8b88.tar.gz | |
tcp: trivial ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/tcp-call-tcp_drop-from-tcp_data_queue_ofo.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/queue/tcp-call-tcp_drop-from-tcp_data_queue_ofo.patch b/queue/tcp-call-tcp_drop-from-tcp_data_queue_ofo.patch index 570a59e..ab34cd4 100644 --- a/queue/tcp-call-tcp_drop-from-tcp_data_queue_ofo.patch +++ b/queue/tcp-call-tcp_drop-from-tcp_data_queue_ofo.patch @@ -1,4 +1,4 @@ -From 8541b21e781a22dce52a74fef0b9bed00404a1cd Mon Sep 17 00:00:00 2001 +From 0ccc0916d01b34f0d132feefa1269b16bc820e65 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Mon, 23 Jul 2018 09:28:20 -0700 Subject: [PATCH] tcp: call tcp_drop() from tcp_data_queue_ofo() @@ -13,12 +13,13 @@ Signed-off-by: Eric Dumazet <edumazet@google.com> Acked-by: Soheil Hassas Yeganeh <soheil@google.com> Acked-by: Yuchung Cheng <ycheng@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c -index 78068b902e7b..b062a7692238 100644 +index a9a33c789b01..afbfa4d25138 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -4510,7 +4510,7 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb) +@@ -4446,7 +4446,7 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb) /* All the bits are present. Drop. */ NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFOMERGE); @@ -27,7 +28,7 @@ index 78068b902e7b..b062a7692238 100644 skb = NULL; tcp_dsack_set(sk, seq, end_seq); goto add_sack; -@@ -4529,7 +4529,7 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb) +@@ -4465,7 +4465,7 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb) TCP_SKB_CB(skb1)->end_seq); NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFOMERGE); @@ -35,7 +36,7 @@ index 78068b902e7b..b062a7692238 100644 + tcp_drop(sk, skb1); goto merge_right; } - } else if (tcp_try_coalesce(sk, skb1, + } else if (tcp_try_coalesce(sk, skb1, skb, &fragstolen)) { -- 2.15.0 |