diff options
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/tcp.c | 14 | ||||
-rw-r--r-- | net/ipv4/tcp_output.c | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 2cf9a898ce50..d6e488668171 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -1573,14 +1573,12 @@ void tcp_close(struct sock *sk, long timeout) | |||
1573 | 1573 | ||
1574 | sk_stream_mem_reclaim(sk); | 1574 | sk_stream_mem_reclaim(sk); |
1575 | 1575 | ||
1576 | /* As outlined in draft-ietf-tcpimpl-prob-03.txt, section | 1576 | /* As outlined in RFC 2525, section 2.17, we send a RST here because |
1577 | * 3.10, we send a RST here because data was lost. To | 1577 | * data was lost. To witness the awful effects of the old behavior of |
1578 | * witness the awful effects of the old behavior of always | 1578 | * always doing a FIN, run an older 2.1.x kernel or 2.0.x, start a bulk |
1579 | * doing a FIN, run an older 2.1.x kernel or 2.0.x, start | 1579 | * GET in an FTP client, suspend the process, wait for the client to |
1580 | * a bulk GET in an FTP client, suspend the process, wait | 1580 | * advertise a zero window, then kill -9 the FTP client, wheee... |
1581 | * for the client to advertise a zero window, then kill -9 | 1581 | * Note: timeout is always zero in such a case. |
1582 | * the FTP client, wheee... Note: timeout is always zero | ||
1583 | * in such a case. | ||
1584 | */ | 1582 | */ |
1585 | if (data_was_unread) { | 1583 | if (data_was_unread) { |
1586 | /* Unread data was tossed, zap the connection. */ | 1584 | /* Unread data was tossed, zap the connection. */ |
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index e70a6840cb64..b5fa3c19afee 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -2035,7 +2035,7 @@ void tcp_send_fin(struct sock *sk) | |||
2035 | /* We get here when a process closes a file descriptor (either due to | 2035 | /* We get here when a process closes a file descriptor (either due to |
2036 | * an explicit close() or as a byproduct of exit()'ing) and there | 2036 | * an explicit close() or as a byproduct of exit()'ing) and there |
2037 | * was unread data in the receive queue. This behavior is recommended | 2037 | * was unread data in the receive queue. This behavior is recommended |
2038 | * by draft-ietf-tcpimpl-prob-03.txt section 3.10. -DaveM | 2038 | * by RFC 2525, section 2.17. -DaveM |
2039 | */ | 2039 | */ |
2040 | void tcp_send_active_reset(struct sock *sk, gfp_t priority) | 2040 | void tcp_send_active_reset(struct sock *sk, gfp_t priority) |
2041 | { | 2041 | { |