aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_output.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r--net/ipv4/tcp_output.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index c22cdcd84320..94d9f0c63682 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1645,7 +1645,9 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *skb, int m
1645 /* Ok. We will be able to collapse the packet. */ 1645 /* Ok. We will be able to collapse the packet. */
1646 tcp_unlink_write_queue(next_skb, sk); 1646 tcp_unlink_write_queue(next_skb, sk);
1647 1647
1648 memcpy(skb_put(skb, next_skb_size), next_skb->data, next_skb_size); 1648 skb_copy_from_linear_data(next_skb,
1649 skb_put(skb, next_skb_size),
1650 next_skb_size);
1649 1651
1650 if (next_skb->ip_summed == CHECKSUM_PARTIAL) 1652 if (next_skb->ip_summed == CHECKSUM_PARTIAL)
1651 skb->ip_summed = CHECKSUM_PARTIAL; 1653 skb->ip_summed = CHECKSUM_PARTIAL;