projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 02ac326)
Phonet: do not set POLLOUT in case of send buffer overflow
authorRémi Denis-Courmont <remi.denis-courmont@nokia.com>
Mon, 30 Aug 2010 12:57:05 +0000 (12:57 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 31 Aug 2010 20:04:33 +0000 (13:04 -0700)
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/phonet/socket.c patch | blob | blame | history

diff --git a/net/phonet/socket.c b/net/phonet/socket.c
index 6e9848bf0370dff4a78827839a9a1057e52fb2b0..7c91f739f13848e63e45a174c35c881301a40a03 100644 (file)
--- a/net/phonet/socket.c
+++ b/net/phonet/socket.c
@@ -281,7 +281,9 @@ static unsigned int pn_socket_poll(struct file *file, struct socket *sock,
        if (!mask && sk->sk_state == TCP_CLOSE_WAIT)
                return POLLHUP;
 
-       if (sk->sk_state == TCP_ESTABLISHED && atomic_read(&pn->tx_credits))
+       if (sk->sk_state == TCP_ESTABLISHED &&
+               atomic_read(&sk->sk_wmem_alloc) < sk->sk_sndbuf &&
+               atomic_read(&pn->tx_credits))
                mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
 
        return mask;