Commit 4260c13b authored by Samuel Ortiz's avatar Samuel Ortiz Committed by John W. Linville
Browse files

NFC: Update the LLCP poll mask 



Fix the poll mask depending on the socket state. POLLOUT was missing
for example.

Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ff353d86

net/nfc/llcp/sock.c

+14 −1
Original line number Diff line number Diff line
@@ -340,11 +340,24 @@ static unsigned int llcp_sock_poll(struct file *file, struct socket *sock, 
		mask |= POLLERR;



	if (!skb_queue_empty(&sk->sk_receive_queue))

		mask |= POLLIN;

		mask |= POLLIN | POLLRDNORM;



	if (sk->sk_state == LLCP_CLOSED)

		mask |= POLLHUP;



	if (sk->sk_shutdown & RCV_SHUTDOWN)

		mask |= POLLRDHUP | POLLIN | POLLRDNORM;



	if (sk->sk_shutdown == SHUTDOWN_MASK)

		mask |= POLLHUP;



	if (sock_writeable(sk))

		mask |= POLLOUT | POLLWRNORM | POLLWRBAND;

	else

		set_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags);



	pr_debug("mask 0x%x\n", mask);



	return mask;

}