diff options
| author | Rémi Denis-Courmont <remi.denis-courmont@nokia.com> | 2008-10-05 22:15:43 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-05 22:15:43 +0400 |
| commit | c41bd97f815720f9404f97da0c4f4400b52c243d (patch) | |
| tree | 104f57ed611ea4a2a7d4cfc370fe3bcd1090a71a /net/phonet/socket.c | |
| parent | 9641458d3ec42def729fde64669abf07f3220cd5 (diff) | |
| download | linux-c41bd97f815720f9404f97da0c4f4400b52c243d.tar.xz | |
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.c | 4 |
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, if (!skb_queue_empty(&sk->sk_receive_queue)) mask |= POLLIN | POLLRDNORM; - else if (sk->sk_state == TCP_CLOSE_WAIT) + if (!skb_queue_empty(&pn->ctrlreq_queue)) + mask |= POLLPRI; + if (!mask && sk->sk_state == TCP_CLOSE_WAIT) return POLLHUP; if (sk->sk_state == TCP_ESTABLISHED && pn->tx_credits) |