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.c | |
| parent | 1c72d8d90da3b29540c3c281a3e0b743ee6b6f74 (diff) | |
| parent | 5e04e7fe774794b837e1d3897e6b96ae2d06679a (diff) | |
Merge branch 'master'
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 72b7c22e1ea5..9ac7a4f46bd8 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
| @@ -1640,7 +1640,7 @@ int tcp_disconnect(struct sock *sk, int flags) | |||
| 1640 | } else if (tcp_need_reset(old_state) || | 1640 | } else if (tcp_need_reset(old_state) || |
| 1641 | (tp->snd_nxt != tp->write_seq && | 1641 | (tp->snd_nxt != tp->write_seq && |
| 1642 | (1 << old_state) & (TCPF_CLOSING | TCPF_LAST_ACK))) { | 1642 | (1 << old_state) & (TCPF_CLOSING | TCPF_LAST_ACK))) { |
| 1643 | /* The last check adjusts for discrepance of Linux wrt. RFC | 1643 | /* The last check adjusts for discrepancy of Linux wrt. RFC |
| 1644 | * states | 1644 | * states |
| 1645 | */ | 1645 | */ |
| 1646 | tcp_send_active_reset(sk, gfp_any()); | 1646 | tcp_send_active_reset(sk, gfp_any()); |
| @@ -1669,6 +1669,7 @@ int tcp_disconnect(struct sock *sk, int flags) | |||
| 1669 | tp->packets_out = 0; | 1669 | tp->packets_out = 0; |
| 1670 | tp->snd_ssthresh = 0x7fffffff; | 1670 | tp->snd_ssthresh = 0x7fffffff; |
| 1671 | tp->snd_cwnd_cnt = 0; | 1671 | tp->snd_cwnd_cnt = 0; |
| 1672 | tp->bytes_acked = 0; | ||
| 1672 | tcp_set_ca_state(sk, TCP_CA_Open); | 1673 | tcp_set_ca_state(sk, TCP_CA_Open); |
| 1673 | tcp_clear_retrans(tp); | 1674 | tcp_clear_retrans(tp); |
| 1674 | inet_csk_delack_init(sk); | 1675 | inet_csk_delack_init(sk); |
