From mboxrd@z Thu Jan 1 00:00:00 1970 From: yuan linyu Subject: [PATCH net-next] net: tap: fix POLLOUT condition in tap_poll() Date: Thu, 14 Dec 2017 22:22:16 +0800 Message-ID: <1513261336-5209-1-git-send-email-cugyly@163.com> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Cc: "David S . Miller" , yuan linyu To: netdev@vger.kernel.org Return-path: Received: from m12-13.163.com ([220.181.12.13]:41548 "EHLO m12-13.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752506AbdLNOWv (ORCPT ); Thu, 14 Dec 2017 09:22:51 -0500 Sender: netdev-owner@vger.kernel.org List-ID: From: yuan linyu from logical view, if sock_writeable(&q->sk) return false, original second condition will return false too, change it and make second condition can return true. Signed-off-by: yuan linyu --- drivers/net/tap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/tap.c b/drivers/net/tap.c index 0a886fda..72212bf 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -587,8 +587,7 @@ static unsigned int tap_poll(struct file *file, poll_table *wait) mask |= POLLIN | POLLRDNORM; if (sock_writeable(&q->sk) || - (!test_and_set_bit(SOCKWQ_ASYNC_NOSPACE, &q->sock.flags) && - sock_writeable(&q->sk))) + !test_and_set_bit(SOCKWQ_ASYNC_NOSPACE, &q->sock.flags)) mask |= POLLOUT | POLLWRNORM; out: -- 2.7.4