diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/tcp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 56a133c61452..631133ebb20a 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -344,8 +344,8 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait) | |||
344 | return inet_csk_listen_poll(sk); | 344 | return inet_csk_listen_poll(sk); |
345 | 345 | ||
346 | /* Socket is not locked. We are protected from async events | 346 | /* Socket is not locked. We are protected from async events |
347 | by poll logic and correct handling of state changes | 347 | * by poll logic and correct handling of state changes |
348 | made by another threads is impossible in any case. | 348 | * made by other threads is impossible in any case. |
349 | */ | 349 | */ |
350 | 350 | ||
351 | mask = 0; | 351 | mask = 0; |
@@ -371,10 +371,10 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait) | |||
371 | * in state CLOSE_WAIT. One solution is evident --- to set POLLHUP | 371 | * in state CLOSE_WAIT. One solution is evident --- to set POLLHUP |
372 | * if and only if shutdown has been made in both directions. | 372 | * if and only if shutdown has been made in both directions. |
373 | * Actually, it is interesting to look how Solaris and DUX | 373 | * Actually, it is interesting to look how Solaris and DUX |
374 | * solve this dilemma. I would prefer, if PULLHUP were maskable, | 374 | * solve this dilemma. I would prefer, if POLLHUP were maskable, |
375 | * then we could set it on SND_SHUTDOWN. BTW examples given | 375 | * then we could set it on SND_SHUTDOWN. BTW examples given |
376 | * in Stevens' books assume exactly this behaviour, it explains | 376 | * in Stevens' books assume exactly this behaviour, it explains |
377 | * why PULLHUP is incompatible with POLLOUT. --ANK | 377 | * why POLLHUP is incompatible with POLLOUT. --ANK |
378 | * | 378 | * |
379 | * NOTE. Check for TCP_CLOSE is added. The goal is to prevent | 379 | * NOTE. Check for TCP_CLOSE is added. The goal is to prevent |
380 | * blocking on fresh not-connected or disconnected socket. --ANK | 380 | * blocking on fresh not-connected or disconnected socket. --ANK |