diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 12:33:31 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 12:33:31 -0400 |
| commit | 6339f8d30a4cb7614705e72716a60153f45513e1 (patch) | |
| tree | 71b261eedc25f4db43576acee6ec18da90a82f3f | |
| parent | 3bf38e570e7b2835e089db29cfcc7be3a30a8b88 (diff) | |
| download | longterm-queue-4.12-6339f8d30a4cb7614705e72716a60153f45513e1.tar.gz | |
tcp: adjust for post-4.12 line-wraps
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/tcp-add-tcp_ooo_try_coalesce-helper.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/queue/tcp-add-tcp_ooo_try_coalesce-helper.patch b/queue/tcp-add-tcp_ooo_try_coalesce-helper.patch index acf8a19..276c52f 100644 --- a/queue/tcp-add-tcp_ooo_try_coalesce-helper.patch +++ b/queue/tcp-add-tcp_ooo_try_coalesce-helper.patch @@ -1,4 +1,4 @@ -From 58152ecbbcc6a0ce7fddd5bf5f6ee535834ece0c Mon Sep 17 00:00:00 2001 +From ce0196d3b4bd42efb71abe0f3d10cdb6386473ce Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Mon, 23 Jul 2018 09:28:21 -0700 Subject: [PATCH] tcp: add tcp_ooo_try_coalesce() helper @@ -17,12 +17,14 @@ 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> +[PG: adjust for line wraps not seen in older 4.12.x code base.] +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c -index b062a7692238..3bcd30a2ba06 100644 +index afbfa4d25138..2a791b9f4090 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -4358,6 +4358,23 @@ static bool tcp_try_coalesce(struct sock *sk, +@@ -4295,6 +4295,23 @@ static bool tcp_try_coalesce(struct sock *sk, return true; } @@ -46,23 +48,21 @@ index b062a7692238..3bcd30a2ba06 100644 static void tcp_drop(struct sock *sk, struct sk_buff *skb) { sk_drops_add(sk, skb); -@@ -4481,8 +4498,8 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb) +@@ -4418,7 +4435,8 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb) /* In the typical case, we are adding an skb to the end of the list. * Use of ooo_last_skb avoids the O(Log(N)) rbtree lookup. */ -- if (tcp_try_coalesce(sk, tp->ooo_last_skb, -- skb, &fragstolen)) { +- if (tcp_try_coalesce(sk, tp->ooo_last_skb, skb, &fragstolen)) { + if (tcp_ooo_try_coalesce(sk, tp->ooo_last_skb, + skb, &fragstolen)) { coalesce_done: tcp_grow_window(sk, skb); kfree_skb_partial(skb, fragstolen); -@@ -4532,8 +4549,8 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb) +@@ -4468,7 +4486,8 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb) tcp_drop(sk, skb1); goto merge_right; } -- } else if (tcp_try_coalesce(sk, skb1, -- skb, &fragstolen)) { +- } else if (tcp_try_coalesce(sk, skb1, skb, &fragstolen)) { + } else if (tcp_ooo_try_coalesce(sk, skb1, + skb, &fragstolen)) { goto coalesce_done; |