Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7432a5ca authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "tcp: return EPOLLOUT from tcp_poll only when notsent_bytes is half the limit" 



This reverts commit 7e120db7.  It is
part of a series that breaks the kernel abi for Android.  For this
kernel tree, we do not care so much about KASAN, so it's not a big issue
to revert.  If it is needed in the future, it can be brought back in an
abi-safe way.

Bug: 161946584
Change-Id: I2bb3f5516eef5546fd2fa8dc5621f82d22847b7f
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 9b73585f

net/ipv4/tcp.c

+2 −2
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait) 
			mask |= EPOLLIN | EPOLLRDNORM;



		if (!(sk->sk_shutdown & SEND_SHUTDOWN)) {

			if (__sk_stream_is_writeable(sk, 1)) {

			if (sk_stream_is_writeable(sk)) {

				mask |= EPOLLOUT | EPOLLWRNORM;

			} else {  /* send SIGIO later */

				sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);
@@ -588,7 +588,7 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait) 
				 * pairs with the input side.

				 */

				smp_mb__after_atomic();

				if (__sk_stream_is_writeable(sk, 1))

				if (sk_stream_is_writeable(sk))

					mask |= EPOLLOUT | EPOLLWRNORM;

			}

		} else