Revert "tcp: deny tcp_disconnect() when threads are waiting"
This reverts commit cccc620970
which is
commit 4faeee0cf8a5d88d63cdbc3bab124fb0e6aed08c upstream.
It breaks the Android kernel abi, and if it is needed in the future can
come back in an abi-safe way.
Bug: 161946584
Change-Id: If50dd244848a8aa70b08be347020b263c71f4a61
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
@@ -2727,12 +2727,6 @@ int tcp_disconnect(struct sock *sk, int flags)
|
||||
int old_state = sk->sk_state;
|
||||
u32 seq;
|
||||
|
||||
/* Deny disconnect if other threads are blocked in sk_wait_event()
|
||||
* or inet_wait_for_connect().
|
||||
*/
|
||||
if (sk->sk_wait_pending)
|
||||
return -EBUSY;
|
||||
|
||||
if (old_state != TCP_CLOSE)
|
||||
tcp_set_state(sk, TCP_CLOSE);
|
||||
|
||||
|
Reference in New Issue
Block a user