diff options
| author | Eric Dumazet <edumazet@google.com> | 2021-10-27 13:19:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-10-28 12:44:38 +0100 |
| commit | bd446314717176507e629b6b5511c107b99c1c25 (patch) | |
| tree | b0295fbc572185d22c9d13bf2c2a9bc809bd3832 /net/ipv4/tcp_output.c | |
| parent | 27728ba80f1eb279b209bbd5922fdeebe52d9e30 (diff) | |
| download | linux-bd446314717176507e629b6b5511c107b99c1c25.tar.bz2 | |
tcp: remove dead code from tcp_collapse_retrans()
TCP sendmsg() no longer puts payload in skb->head,
remove some dead code from tcp_collapse_retrans().
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index c0c55a8be8f7..e1dcc93d5b6d 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -3045,13 +3045,9 @@ static bool tcp_collapse_retrans(struct sock *sk, struct sk_buff *skb) BUG_ON(tcp_skb_pcount(skb) != 1 || tcp_skb_pcount(next_skb) != 1); - if (next_skb_size) { - if (next_skb_size <= skb_availroom(skb)) - skb_copy_bits(next_skb, 0, skb_put(skb, next_skb_size), - next_skb_size); - else if (!tcp_skb_shift(skb, next_skb, 1, next_skb_size)) - return false; - } + if (next_skb_size && !tcp_skb_shift(skb, next_skb, 1, next_skb_size)) + return false; + tcp_highest_sack_replace(sk, next_skb, skb); /* Update sequence range on original skb. */ |