lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SK_BUFF]: Some more conversions to skb_copy_from_linear_data

Browse Source 
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
This commit is contained in:
Arnaldo Carvalho de Melo
2007-03-31 11:55:45 -03:00
committed by David S. Miller
parent 27d7ff46a3
commit 1a4e2d093f
5 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/ipv4/tcp_output.c
View File

@@ -1645,7 +1645,9 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *skb, int m
/* Ok. We will be able to collapse the packet. */
tcp_unlink_write_queue(next_skb, sk);
memcpy(skb_put(skb, next_skb_size), next_skb->data, next_skb_size);
skb_copy_from_linear_data(next_skb,
skb_put(skb, next_skb_size),
next_skb_size);
if (next_skb->ip_summed == CHECKSUM_PARTIAL)
skb->ip_summed = CHECKSUM_PARTIAL;