aboutsummaryrefslogtreecommitdiffstats
path: root/net/phonet/socket.c
diff options
context:
space:
mode:
authorRémi Denis-Courmont <remi.denis-courmont@nokia.com>2008-10-05 14:15:43 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-05 14:15:43 -0400
commitc41bd97f815720f9404f97da0c4f4400b52c243d (patch)
tree104f57ed611ea4a2a7d4cfc370fe3bcd1090a71a /net/phonet/socket.c
parent9641458d3ec42def729fde64669abf07f3220cd5 (diff)
Phonet: receive pipe control requests as out-of-band data
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/phonet/socket.c')
-rw-r--r--net/phonet/socket.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/phonet/socket.c b/net/phonet/socket.c
index cea1136cbe46..a9c3d1f2e9db 100644
--- a/net/phonet/socket.c
+++ b/net/phonet/socket.c
@@ -220,7 +220,9 @@ static unsigned int pn_socket_poll(struct file *file, struct socket *sock,
220 220
221 if (!skb_queue_empty(&sk->sk_receive_queue)) 221 if (!skb_queue_empty(&sk->sk_receive_queue))
222 mask |= POLLIN | POLLRDNORM; 222 mask |= POLLIN | POLLRDNORM;
223 else if (sk->sk_state == TCP_CLOSE_WAIT) 223 if (!skb_queue_empty(&pn->ctrlreq_queue))
224 mask |= POLLPRI;
225 if (!mask && sk->sk_state == TCP_CLOSE_WAIT)
224 return POLLHUP; 226 return POLLHUP;
225 227
226 if (sk->sk_state == TCP_ESTABLISHED && pn->tx_credits) 228 if (sk->sk_state == TCP_ESTABLISHED && pn->tx_credits)