mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-11 15:11:48 -04:00
Merge "tcp: Reset tcp connections in SYN-SENT state"
This commit is contained in:
commit
899d1ad7dd
1 changed files with 2 additions and 3 deletions
|
|
@ -2513,7 +2513,7 @@ static inline bool tcp_need_reset(int state)
|
|||
{
|
||||
return (1 << state) &
|
||||
(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT | TCPF_FIN_WAIT1 |
|
||||
TCPF_FIN_WAIT2 | TCPF_SYN_RECV);
|
||||
TCPF_FIN_WAIT2 | TCPF_SYN_RECV | TCPF_SYN_SENT);
|
||||
}
|
||||
|
||||
static void tcp_rtx_queue_purge(struct sock *sk)
|
||||
|
|
@ -2579,8 +2579,7 @@ int tcp_disconnect(struct sock *sk, int flags)
|
|||
*/
|
||||
tcp_send_active_reset(sk, gfp_any());
|
||||
sk->sk_err = ECONNRESET;
|
||||
} else if (old_state == TCP_SYN_SENT)
|
||||
sk->sk_err = ECONNRESET;
|
||||
}
|
||||
|
||||
tcp_clear_xmit_timers(sk);
|
||||
__skb_queue_purge(&sk->sk_receive_queue);
|
||||
|
|
|
|||
Loading…
Reference in a new issue