From 61e1869018c1bb002fdb5698561a194a999995f3 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Wed, 16 Jul 2008 20:13:43 -0700 Subject: [PATCH] --- yaml --- r: 103557 b: refs/heads/master c: 70efce27fc3d54271519244dc5e47da4ed711dd4 h: refs/heads/master i: 103555: 1dbe8b586aa262a0236610a1f27934b56ad327a5 v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d1fb8a36efc7..f638e601fc61 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b1c65faa27f5ade3915e4bbc9186b6e64d2d6ec +refs/heads/master: 70efce27fc3d54271519244dc5e47da4ed711dd4 diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c index 56a133c61452..631133ebb20a 100644 --- a/trunk/net/ipv4/tcp.c +++ b/trunk/net/ipv4/tcp.c @@ -344,8 +344,8 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait) return inet_csk_listen_poll(sk); /* Socket is not locked. We are protected from async events - by poll logic and correct handling of state changes - made by another threads is impossible in any case. + * by poll logic and correct handling of state changes + * made by other threads is impossible in any case. */ mask = 0; @@ -371,10 +371,10 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait) * in state CLOSE_WAIT. One solution is evident --- to set POLLHUP * if and only if shutdown has been made in both directions. * Actually, it is interesting to look how Solaris and DUX - * solve this dilemma. I would prefer, if PULLHUP were maskable, + * solve this dilemma. I would prefer, if POLLHUP were maskable, * then we could set it on SND_SHUTDOWN. BTW examples given * in Stevens' books assume exactly this behaviour, it explains - * why PULLHUP is incompatible with POLLOUT. --ANK + * why POLLHUP is incompatible with POLLOUT. --ANK * * NOTE. Check for TCP_CLOSE is added. The goal is to prevent * blocking on fresh not-connected or disconnected socket. --ANK