diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 13:32:07 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 13:32:07 -0400 |
| commit | 9b4ff2cb155ff43683ff690c2868e952c00ea05d (patch) | |
| tree | c0b57bbb8d76100a92451dd752850f5a50cd32fa | |
| parent | b4e38d7eb5b4ab308ff4061333d9d49e9ffbe983 (diff) | |
| download | longterm-queue-4.12-9b4ff2cb155ff43683ff690c2868e952c00ea05d.tar.gz | |
tcp: refresh for newly added net wrapper patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/tcp-free-batches-of-packets-in-tcp_prune_ofo_queue.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/queue/tcp-free-batches-of-packets-in-tcp_prune_ofo_queue.patch b/queue/tcp-free-batches-of-packets-in-tcp_prune_ofo_queue.patch index ee5ea03..c7d6657 100644 --- a/queue/tcp-free-batches-of-packets-in-tcp_prune_ofo_queue.patch +++ b/queue/tcp-free-batches-of-packets-in-tcp_prune_ofo_queue.patch @@ -1,4 +1,4 @@ -From e639c631cd6f83b04f89f147bfee48189d56ebd4 Mon Sep 17 00:00:00 2001 +From f18e6b76e301c65eed1572ba19b827566bfe03a0 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Mon, 23 Jul 2018 09:28:17 -0700 Subject: [PATCH] tcp: free batches of packets in tcp_prune_ofo_queue() @@ -29,10 +29,10 @@ 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 c37915f00a51..595fd7d11004 100644 +index 54d846d007f8..06fcf7cd649b 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -4895,6 +4895,7 @@ static void tcp_collapse_ofo_queue(struct sock *sk) +@@ -4886,6 +4886,7 @@ static void tcp_collapse_ofo_queue(struct sock *sk) * 2) not add too big latencies if thousands of packets sit there. * (But if application shrinks SO_RCVBUF, we could still end up * freeing whole queue here) @@ -40,7 +40,7 @@ index c37915f00a51..595fd7d11004 100644 * * Return true if queue has shrunk. */ -@@ -4902,20 +4903,26 @@ static bool tcp_prune_ofo_queue(struct sock *sk) +@@ -4893,20 +4894,26 @@ static bool tcp_prune_ofo_queue(struct sock *sk) { struct tcp_sock *tp = tcp_sk(sk); struct rb_node *node, *prev; @@ -56,7 +56,7 @@ index c37915f00a51..595fd7d11004 100644 prev = rb_prev(node); rb_erase(node, &tp->out_of_order_queue); + goal -= rb_to_skb(node)->truesize; - tcp_drop(sk, rb_entry(node, struct sk_buff, rbnode)); + tcp_drop(sk, rb_to_skb(node)); - sk_mem_reclaim(sk); - if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf && - !tcp_under_memory_pressure(sk)) @@ -70,7 +70,7 @@ index c37915f00a51..595fd7d11004 100644 + } node = prev; } while (node); - tp->ooo_last_skb = rb_entry(prev, struct sk_buff, rbnode); + tp->ooo_last_skb = rb_to_skb(prev); -- 2.15.0 |