diff options
| author | Tejun Heo <tj@kernel.org> | 2009-01-31 00:36:00 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-01-31 00:36:00 -0500 |
| commit | da2c0b021cde94866f1e492f940aad29e8f61258 (patch) | |
| tree | 0455f3e221d6128ba1efb68135c3fbe2c2c8b390 /net/ipv4/tcp.c | |
| parent | 795f99b61d20c34cb04d17d8906b32f745a635ec (diff) | |
| parent | 33bfad54b58cf05cfe6678c3ec9235d4bc8db4c2 (diff) | |
Merge branch 'master' into tj-percpu
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 0cd71b84e483..76b148bcb0dc 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, | |||
| 524 | struct tcp_splice_state *tss = rd_desc->arg.data; | 524 | struct tcp_splice_state *tss = rd_desc->arg.data; |
| 525 | int ret; | 525 | int ret; |
| 526 | 526 | ||
| 527 | ret = skb_splice_bits(skb, offset, tss->pipe, rd_desc->count, tss->flags); | 527 | ret = skb_splice_bits(skb, offset, tss->pipe, min(rd_desc->count, len), |
| 528 | tss->flags); | ||
| 528 | if (ret > 0) | 529 | if (ret > 0) |
| 529 | rd_desc->count -= ret; | 530 | rd_desc->count -= ret; |
| 530 | return ret; | 531 | return ret; |