diff options
author | David S. Miller | 2009-01-30 23:31:07 +0100 |
---|---|---|
committer | David S. Miller | 2009-01-30 23:31:07 +0100 |
commit | 05bee4737774881e027bfd9a8b5c40a7d68f6325 (patch) | |
tree | 5fd32eb8fe345d2d30e85910beac241a4439e8cd /net/ipv4/tcp.c | |
parent | gro: Open-code memcpy in napi_fraginfo_skb (diff) | |
parent | packet: Avoid lock_sock in mmap handler (diff) | |
download | kernel-qcow2-linux-05bee4737774881e027bfd9a8b5c40a7d68f6325.tar.gz kernel-qcow2-linux-05bee4737774881e027bfd9a8b5c40a7d68f6325.tar.xz kernel-qcow2-linux-05bee4737774881e027bfd9a8b5c40a7d68f6325.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000/e1000_main.c
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r-- | net/ipv4/tcp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 1cd608253940..73266b79c19a 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -524,7 +524,8 @@ static int tcp_splice_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb, struct tcp_splice_state *tss = rd_desc->arg.data; int ret; - ret = skb_splice_bits(skb, offset, tss->pipe, rd_desc->count, tss->flags); + ret = skb_splice_bits(skb, offset, tss->pipe, min(rd_desc->count, len), + tss->flags); if (ret > 0) rd_desc->count -= ret; return ret; |