diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-29 19:58:22 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-29 19:58:22 -0500 |
| commit | 79072f38909e3d9883317238887460c39ddcc4cb (patch) | |
| tree | 28369f5a844535ff836565eefd62695b0e890fa3 /net/sctp/socket.c | |
| parent | 200d5a7684cc49ef4be40e832daf3f217e70dfbb (diff) | |
| parent | 55d8ca4f8094246da6e71889a4e04bfafaa78b10 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'net/sctp/socket.c')
| -rw-r--r-- | net/sctp/socket.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 0ea947eb6813..b6e4b89539b3 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
| @@ -4894,6 +4894,8 @@ unsigned int sctp_poll(struct file *file, struct socket *sock, poll_table *wait) | |||
| 4894 | /* Is there any exceptional events? */ | 4894 | /* Is there any exceptional events? */ |
| 4895 | if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) | 4895 | if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) |
| 4896 | mask |= POLLERR; | 4896 | mask |= POLLERR; |
| 4897 | if (sk->sk_shutdown & RCV_SHUTDOWN) | ||
| 4898 | mask |= POLLRDHUP; | ||
| 4897 | if (sk->sk_shutdown == SHUTDOWN_MASK) | 4899 | if (sk->sk_shutdown == SHUTDOWN_MASK) |
| 4898 | mask |= POLLHUP; | 4900 | mask |= POLLHUP; |
| 4899 | 4901 | ||