diff options
| author | Herbert Xu <herbert@lithui.me.apana.org.au> | 2017-12-22 04:00:50 -0500 |
|---|---|---|
| committer | Herbert Xu <herbert@lithui.me.apana.org.au> | 2017-12-22 04:00:50 -0500 |
| commit | 45fa9a324d0f5be9140ba2e0db9b8fb8a0b9b7e8 (patch) | |
| tree | a5e7c8428030ec0462b58133d6548ddff3802018 /net/ipv4/tcp.c | |
| parent | fc8517bf627c9b834f80274a1bc9ecd39b27231b (diff) | |
| parent | 2973633e9f09311e849f975d969737af81a521ff (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pick up inside-secure fixes.
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index bf97317e6c97..f08eebe60446 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
| @@ -2412,6 +2412,7 @@ int tcp_disconnect(struct sock *sk, int flags) | |||
| 2412 | tp->snd_cwnd_cnt = 0; | 2412 | tp->snd_cwnd_cnt = 0; |
| 2413 | tp->window_clamp = 0; | 2413 | tp->window_clamp = 0; |
| 2414 | tcp_set_ca_state(sk, TCP_CA_Open); | 2414 | tcp_set_ca_state(sk, TCP_CA_Open); |
| 2415 | tp->is_sack_reneg = 0; | ||
| 2415 | tcp_clear_retrans(tp); | 2416 | tcp_clear_retrans(tp); |
| 2416 | inet_csk_delack_init(sk); | 2417 | inet_csk_delack_init(sk); |
| 2417 | /* Initialize rcv_mss to TCP_MIN_MSS to avoid division by 0 | 2418 | /* Initialize rcv_mss to TCP_MIN_MSS to avoid division by 0 |