From eff6b8ebf565e9d72d9bbad0102fe2329df3cdc8 Mon Sep 17 00:00:00 2001 From: Jerry Chu Date: Tue, 25 Jan 2011 13:46:30 -0800 Subject: [PATCH] --- yaml --- r: 232465 b: refs/heads/master c: 44f5324b5d13ef2187729d949eca442689627f39 h: refs/heads/master i: 232463: 28b10c4f64f40d6019f2aec67c7e1437bc7919fc v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_input.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5b1c75ec1b2c..c34af6499796 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73a8bd74e2618990dbb218c3d82f53e60acd9af0 +refs/heads/master: 44f5324b5d13ef2187729d949eca442689627f39 diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c index 2549b29b062d..eb7f82ebf4a3 100644 --- a/trunk/net/ipv4/tcp_input.c +++ b/trunk/net/ipv4/tcp_input.c @@ -4399,7 +4399,7 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb) if (!skb_copy_datagram_iovec(skb, 0, tp->ucopy.iov, chunk)) { tp->ucopy.len -= chunk; tp->copied_seq += chunk; - eaten = (chunk == skb->len && !th->fin); + eaten = (chunk == skb->len); tcp_rcv_space_adjust(sk); } local_bh_disable();