diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:50:22 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:50:22 -0500 |
| commit | f85272a97825d4a67098a8ad70fa5efb55e4847a (patch) | |
| tree | e55b38e21b45213269057417032db4440e8f5eed /net/ipv4/tcp_timer.c | |
| parent | 1c72d8d90da3b29540c3c281a3e0b743ee6b6f74 (diff) | |
| parent | 5e04e7fe774794b837e1d3897e6b96ae2d06679a (diff) | |
Merge branch 'master'
Diffstat (limited to 'net/ipv4/tcp_timer.c')
| -rw-r--r-- | net/ipv4/tcp_timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index 415ee47ac1c5..e1880959614a 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c | |||
| @@ -58,7 +58,7 @@ static void tcp_write_err(struct sock *sk) | |||
| 58 | * to prevent DoS attacks. It is called when a retransmission timeout | 58 | * to prevent DoS attacks. It is called when a retransmission timeout |
| 59 | * or zero probe timeout occurs on orphaned socket. | 59 | * or zero probe timeout occurs on orphaned socket. |
| 60 | * | 60 | * |
| 61 | * Criterium is still not confirmed experimentally and may change. | 61 | * Criteria is still not confirmed experimentally and may change. |
| 62 | * We kill the socket, if: | 62 | * We kill the socket, if: |
| 63 | * 1. If number of orphaned sockets exceeds an administratively configured | 63 | * 1. If number of orphaned sockets exceeds an administratively configured |
| 64 | * limit. | 64 | * limit. |
| @@ -132,7 +132,7 @@ static int tcp_write_timeout(struct sock *sk) | |||
| 132 | hole detection. :-( | 132 | hole detection. :-( |
| 133 | 133 | ||
| 134 | It is place to make it. It is not made. I do not want | 134 | It is place to make it. It is not made. I do not want |
| 135 | to make it. It is disguisting. It does not work in any | 135 | to make it. It is disgusting. It does not work in any |
| 136 | case. Let me to cite the same draft, which requires for | 136 | case. Let me to cite the same draft, which requires for |
| 137 | us to implement this: | 137 | us to implement this: |
| 138 | 138 | ||