diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 00:24:21 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 00:24:21 -0500 |
| commit | 79ffeeb9e66da8c60de8c8ab676658bcbc47c1f7 (patch) | |
| tree | f3c3841e1d4b5c7cd3695fe34ff23e0be08d7dac /net/ipv4/tcp_timer.c | |
| parent | a5aac37f1cdbbd1e587fc618e778ddae124e5ac3 (diff) | |
| parent | 6a438bbe68c7013a42d9c5aee5a40d7dafdbe6ec (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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 | ||