diff options
Diffstat (limited to 'net/ipv4/tcp_minisocks.c')
| -rw-r--r-- | net/ipv4/tcp_minisocks.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index b1a63b2c6b4a..1b66a2ac4321 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c | |||
| @@ -158,7 +158,7 @@ kill_with_rst: | |||
| 158 | /* I am shamed, but failed to make it more elegant. | 158 | /* I am shamed, but failed to make it more elegant. |
| 159 | * Yes, it is direct reference to IP, which is impossible | 159 | * Yes, it is direct reference to IP, which is impossible |
| 160 | * to generalize to IPv6. Taking into account that IPv6 | 160 | * to generalize to IPv6. Taking into account that IPv6 |
| 161 | * do not undertsnad recycling in any case, it not | 161 | * do not understand recycling in any case, it not |
| 162 | * a big problem in practice. --ANK */ | 162 | * a big problem in practice. --ANK */ |
| 163 | if (tw->tw_family == AF_INET && | 163 | if (tw->tw_family == AF_INET && |
| 164 | tcp_death_row.sysctl_tw_recycle && tcptw->tw_ts_recent_stamp && | 164 | tcp_death_row.sysctl_tw_recycle && tcptw->tw_ts_recent_stamp && |
| @@ -194,7 +194,7 @@ kill_with_rst: | |||
| 194 | /* In window segment, it may be only reset or bare ack. */ | 194 | /* In window segment, it may be only reset or bare ack. */ |
| 195 | 195 | ||
| 196 | if (th->rst) { | 196 | if (th->rst) { |
| 197 | /* This is TIME_WAIT assasination, in two flavors. | 197 | /* This is TIME_WAIT assassination, in two flavors. |
| 198 | * Oh well... nobody has a sufficient solution to this | 198 | * Oh well... nobody has a sufficient solution to this |
| 199 | * protocol bug yet. | 199 | * protocol bug yet. |
| 200 | */ | 200 | */ |
| @@ -380,6 +380,7 @@ struct sock *tcp_create_openreq_child(struct sock *sk, struct request_sock *req, | |||
| 380 | */ | 380 | */ |
| 381 | newtp->snd_cwnd = 2; | 381 | newtp->snd_cwnd = 2; |
| 382 | newtp->snd_cwnd_cnt = 0; | 382 | newtp->snd_cwnd_cnt = 0; |
| 383 | newtp->bytes_acked = 0; | ||
| 383 | 384 | ||
| 384 | newtp->frto_counter = 0; | 385 | newtp->frto_counter = 0; |
| 385 | newtp->frto_highmark = 0; | 386 | newtp->frto_highmark = 0; |
| @@ -550,7 +551,7 @@ struct sock *tcp_check_req(struct sock *sk,struct sk_buff *skb, | |||
| 550 | 551 | ||
| 551 | /* RFC793 page 36: "If the connection is in any non-synchronized state ... | 552 | /* RFC793 page 36: "If the connection is in any non-synchronized state ... |
| 552 | * and the incoming segment acknowledges something not yet | 553 | * and the incoming segment acknowledges something not yet |
| 553 | * sent (the segment carries an unaccaptable ACK) ... | 554 | * sent (the segment carries an unacceptable ACK) ... |
| 554 | * a reset is sent." | 555 | * a reset is sent." |
| 555 | * | 556 | * |
| 556 | * Invalid ACK: reset will be sent by listening socket | 557 | * Invalid ACK: reset will be sent by listening socket |
