diff options
| author |   Arnaldo Carvalho de Melo <acme@ghostprotocols.net> | 2007-03-31 11:55:45 -0300 |
|---|---|---|
| committer |   David S. Miller <davem@sunset.davemloft.net> | 2007-04-25 22:28:30 -0700 |
| commit | 1a4e2d093fd5f3eaf8cffc04a1b803f8b0ddef6d (patch) | |
| tree | 2743aa6311b434840e82b6107013c34605534816 /net/ipv4/tcp_output.c | |
| parent | [SK_BUFF]: Introduce skb_copy_to_linear_data{_offset} (diff) | |
| download | linux-dev-1a4e2d093fd5f3eaf8cffc04a1b803f8b0ddef6d.tar.xz linux-dev-1a4e2d093fd5f3eaf8cffc04a1b803f8b0ddef6d.zip | |
[SK_BUFF]: Some more conversions to skb_copy_from_linear_data
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 4 |
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 /* 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; |