patch-2.1.123 linux/net/ipv4/tcp.c

• Lines: 22
• Date: Fri Sep 25 10:57:06 1998
• Orig file: v2.1.122/linux/net/ipv4/tcp.c
• Orig date: Thu Sep 17 17:53:39 1998

diff -u --recursive --new-file v2.1.122/linux/net/ipv4/tcp.c linux/net/ipv4/tcp.c
@@ -598,9 +598,9 @@
 		     sk->urginline || !tp->urg_data))
 			mask |= POLLIN | POLLRDNORM;
 
-		/* Always wake the user up when an error occurred */
-		if (sock_wspace(sk) >= tcp_min_write_space(sk, tp) || sk->err)
+		if (sock_wspace(sk) >= tcp_min_write_space(sk, tp))
 			mask |= POLLOUT | POLLWRNORM;
+
 		if (tp->urg_data & URG_VALID)
 			mask |= POLLPRI;
 	}
@@ -1458,7 +1458,8 @@
 	 *  reader process may not have drained the data yet!
 	 */
 	while((skb=__skb_dequeue(&sk->receive_queue))!=NULL) {
-		data_was_unread++;
+		u32 len = TCP_SKB_CB(skb)->end_seq - TCP_SKB_CB(skb)->seq - skb->h.th->fin;
+		data_was_unread += len;
 		kfree_skb(skb);
 	}